1. 12 Apr, 2018 12 commits
  2. 11 Apr, 2018 15 commits
    • Junio C Hamano's avatar
      Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn · fe0a9eaf
      Junio C Hamano authored
      * 'svn/authors-prog-2' of git://bogomips.org/git-svn:
        git-svn: allow empty email-address using authors-prog and authors-file
        git-svn: search --authors-prog in PATH too
      fe0a9eaf
    • Junio C Hamano's avatar
      Revert "Merge branch 'en/rename-directory-detection'" · 8b026eda
      Junio C Hamano authored
      This reverts commit e4bb62fa, reversing
      changes made to 468165c1.
      
      The topic appears to inflict severe regression in renaming merges,
      even though the promise of it was that it would improve them.
      
      We do not yet know which exact change in the topic was wrong, but in
      the meantime, let's play it safe and revert it out of 'master'
      before real Git-using projects are harmed.
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      8b026eda
    • Junio C Hamano's avatar
      The third batch for 2.18 · 26e47e26
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      26e47e26
    • Junio C Hamano's avatar
      Merge branch 'eb/cred-helper-ignore-sigpipe' · 7a94b26f
      Junio C Hamano authored
      When credential helper exits very quickly without reading its
      input, it used to cause Git to die with SIGPIPE, which has been
      fixed.
      
      * eb/cred-helper-ignore-sigpipe:
        credential: ignore SIGPIPE when writing to credential helpers
      7a94b26f
    • Junio C Hamano's avatar
      Merge branch 'lv/tls-1.3' · 9b59d886
      Junio C Hamano authored
      When built with more recent cURL, GIT_SSL_VERSION can now specify
      "tlsv1.3" as its value.
      
      * lv/tls-1.3:
        http: allow use of TLS 1.3
      9b59d886
    • Junio C Hamano's avatar
      Merge branch 'pk/test-avoid-pipe-hiding-exit-status' · c40c1a0d
      Junio C Hamano authored
      Test cleanup.
      
      * pk/test-avoid-pipe-hiding-exit-status:
        test: avoid pipes in git related commands for test
      c40c1a0d
    • Junio C Hamano's avatar
      Merge branch 'rs/status-with-removed-submodule' · 103251a3
      Junio C Hamano authored
      "git submodule status" misbehaved on a submodule that has been
      removed from the working tree.
      
      * rs/status-with-removed-submodule:
        submodule: check for NULL return of get_submodule_ref_store()
      103251a3
    • Junio C Hamano's avatar
      Merge branch 'nd/combined-test-helper' · 27f25845
      Junio C Hamano authored
      Small test-helper programs have been consolidated into a single
      binary.
      
      * nd/combined-test-helper: (36 commits)
        t/helper: merge test-write-cache into test-tool
        t/helper: merge test-wildmatch into test-tool
        t/helper: merge test-urlmatch-normalization into test-tool
        t/helper: merge test-subprocess into test-tool
        t/helper: merge test-submodule-config into test-tool
        t/helper: merge test-string-list into test-tool
        t/helper: merge test-strcmp-offset into test-tool
        t/helper: merge test-sigchain into test-tool
        t/helper: merge test-sha1-array into test-tool
        t/helper: merge test-scrap-cache-tree into test-tool
        t/helper: merge test-run-command into test-tool
        t/helper: merge test-revision-walking into test-tool
        t/helper: merge test-regex into test-tool
        t/helper: merge test-ref-store into test-tool
        t/helper: merge test-read-cache into test-tool
        t/helper: merge test-prio-queue into test-tool
        t/helper: merge test-path-utils into test-tool
        t/helper: merge test-online-cpus into test-tool
        t/helper: merge test-mktemp into test-tool
        t/helper: merge (unused) test-mergesort into test-tool
        ...
      27f25845
    • Junio C Hamano's avatar
      Merge branch 'sb/packfiles-in-repository' · 3a1ec60c
      Junio C Hamano authored
      Refactoring of the internal global data structure continues.
      
      * sb/packfiles-in-repository:
        packfile: keep prepare_packed_git() private
        packfile: allow find_pack_entry to handle arbitrary repositories
        packfile: add repository argument to find_pack_entry
        packfile: allow reprepare_packed_git to handle arbitrary repositories
        packfile: allow prepare_packed_git to handle arbitrary repositories
        packfile: allow prepare_packed_git_one to handle arbitrary repositories
        packfile: add repository argument to reprepare_packed_git
        packfile: add repository argument to prepare_packed_git
        packfile: add repository argument to prepare_packed_git_one
        packfile: allow install_packed_git to handle arbitrary repositories
        packfile: allow rearrange_packed_git to handle arbitrary repositories
        packfile: allow prepare_packed_git_mru to handle arbitrary repositories
      3a1ec60c
    • Junio C Hamano's avatar
      Merge branch 'sb/object-store' · cf0b1793
      Junio C Hamano authored
      Refactoring the internal global data structure to make it possible
      to open multiple repositories, work with and then close them.
      
      Rerolled by Duy on top of a separate preliminary clean-up topic.
      The resulting structure of the topics looked very sensible.
      
      * sb/object-store: (27 commits)
        sha1_file: allow sha1_loose_object_info to handle arbitrary repositories
        sha1_file: allow map_sha1_file to handle arbitrary repositories
        sha1_file: allow map_sha1_file_1 to handle arbitrary repositories
        sha1_file: allow open_sha1_file to handle arbitrary repositories
        sha1_file: allow stat_sha1_file to handle arbitrary repositories
        sha1_file: allow sha1_file_name to handle arbitrary repositories
        sha1_file: add repository argument to sha1_loose_object_info
        sha1_file: add repository argument to map_sha1_file
        sha1_file: add repository argument to map_sha1_file_1
        sha1_file: add repository argument to open_sha1_file
        sha1_file: add repository argument to stat_sha1_file
        sha1_file: add repository argument to sha1_file_name
        sha1_file: allow prepare_alt_odb to handle arbitrary repositories
        sha1_file: allow link_alt_odb_entries to handle arbitrary repositories
        sha1_file: add repository argument to prepare_alt_odb
        sha1_file: add repository argument to link_alt_odb_entries
        sha1_file: add repository argument to read_info_alternates
        sha1_file: add repository argument to link_alt_odb_entry
        sha1_file: add raw_object_store argument to alt_odb_usable
        pack: move approximate object count to object store
        ...
      cf0b1793
    • Junio C Hamano's avatar
      Merge branch 'jc/test-must-be-empty' · 5ff42d42
      Junio C Hamano authored
      Test helper update.
      
      * jc/test-must-be-empty:
        test_must_be_empty: simplify file existence check
      5ff42d42
    • Junio C Hamano's avatar
      Merge branch 'cc/perf-aggregate-sort' · 18196307
      Junio C Hamano authored
      Perf-test update.
      
      * cc/perf-aggregate-sort:
        perf/aggregate: add --sort-by=regression option
        perf/aggregate: add display_dir()
      18196307
    • Junio C Hamano's avatar
      Merge branch 'ab/doc-hash-brokenness' · d877975e
      Junio C Hamano authored
      Doc updates.
      
      * ab/doc-hash-brokenness:
        doc hash-function-transition: clarify what SHAttered means
        doc hash-function-transition: clarify how older gits die on NewHash
      d877975e
    • Junio C Hamano's avatar
      Merge branch 'bc/hash-independent-tests' · 709f9f5b
      Junio C Hamano authored
      Tests that rely on the exact hardcoded values of object names have
      been updated in preparation for hash function migration.
      
      * bc/hash-independent-tests:
        t2107: abstract away SHA-1-specific constants
        t2101: abstract away SHA-1-specific constants
        t2101: modernize test style
        t2020: abstract away SHA-1 specific constants
        t1507: abstract away SHA-1-specific constants
        t1411: abstract away SHA-1-specific constants
        t1405: sort reflog entries in a hash-independent way
        t1300: abstract away SHA-1-specific constants
        t1304: abstract away SHA-1-specific constants
        t1011: abstract away SHA-1-specific constants
      709f9f5b
    • Junio C Hamano's avatar
      Merge branch 'ab/drop-contrib-examples' · cd94dd02
      Junio C Hamano authored
      * ab/drop-contrib-examples:
        Remove contrib/examples/*
      cd94dd02
  3. 10 Apr, 2018 10 commits
    • Junio C Hamano's avatar
      The second batch for 2.18 · 0b0cc9f8
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      0b0cc9f8
    • Junio C Hamano's avatar
      Merge branch 'ys/bisect-object-id-missing-conversion-fix' · aa1c2b68
      Junio C Hamano authored
      Code clean-up.
      
      * ys/bisect-object-id-missing-conversion-fix:
        bisect: use oid_to_hex() for converting object_id hashes to hex strings
      aa1c2b68
    • Junio C Hamano's avatar
      Merge branch 'yk/filter-branch-non-committish-refs' · 9aa3a4c4
      Junio C Hamano authored
      when refs that do not point at committish are given, "git
      filter-branch" gave a misleading error messages.  This has been
      corrected.
      
      * yk/filter-branch-non-committish-refs:
        filter-branch: fix errors caused by refs that point at non-committish
      9aa3a4c4
    • Junio C Hamano's avatar
      Merge branch 'nd/trace-with-env' · e8cb62f1
      Junio C Hamano authored
      Code cleanup.
      
      * nd/trace-with-env:
        run-command: use strbuf_addstr() for adding a string to a strbuf
      e8cb62f1
    • Junio C Hamano's avatar
      Merge branch 'nd/parseopt-completion-more' · ef06d74b
      Junio C Hamano authored
      The mechanism to use parse-options API to automate the command line
      completion continues to get extended and polished.
      
      * nd/parseopt-completion-more:
        completion: use __gitcomp_builtin in _git_cherry
        completion: use __gitcomp_builtin in _git_ls_tree
        completion: delete option-only completion commands
        completion: add --option completion for most builtin commands
        completion: factor out _git_xxx calling code
        completion: mention the oldest version we need to support
        git.c: add hidden option --list-parseopt-builtins
        git.c: move cmd_struct declaration up
      ef06d74b
    • Junio C Hamano's avatar
      Merge branch 'ds/bsearch-hash' · 51f813c6
      Junio C Hamano authored
      Code to find the length to uniquely abbreviate object names based
      on packfile content, which is a relatively recent addtion, has been
      optimized to use the same fan-out table.
      
      * ds/bsearch-hash:
        sha1_name: use bsearch_pack() in unique_in_pack()
        sha1_name: use bsearch_pack() for abbreviations
        packfile: define and use bsearch_pack()
        sha1_name: convert struct min_abbrev_data to object_id
      51f813c6
    • Junio C Hamano's avatar
      Merge branch 'ws/rebase-p' · 57e4b1c6
      Junio C Hamano authored
      Code clean-up.
      
      * ws/rebase-p:
        rebase: remove merges_option and a blank line
        rebase: remove unused code paths from git_rebase__interactive__preserve_merges
        rebase: remove unused code paths from git_rebase__interactive
        rebase: add and use git_rebase__interactive__preserve_merges
        rebase: extract functions out of git_rebase__interactive
        rebase: reindent function git_rebase__interactive
        rebase: update invocation of rebase dot-sourced scripts
        rebase-interactive: simplify pick_on_preserving_merges
      57e4b1c6
    • Junio C Hamano's avatar
      Merge branch 'jk/diff-highlight-graph-fix' · d19e5565
      Junio C Hamano authored
      "diff-highlight" filter (in contrib/) learned to undertand "git log
      --graph" output better.
      
      * jk/diff-highlight-graph-fix:
        diff-highlight: detect --graph by indent
        diff-highlight: use flush() helper consistently
        diff-highlight: test graphs with --color
        diff-highlight: test interleaved parallel lines of history
        diff-highlight: prefer "echo" to "cat" in tests
        diff-highlight: use test_tick in graph test
        diff-highlight: correct test graph diagram
      d19e5565
    • Junio C Hamano's avatar
      Merge branch 'nd/remove-ignore-env-field' · 0873c393
      Junio C Hamano authored
      Code clean-up for the "repository" abstraction.
      
      * nd/remove-ignore-env-field:
        repository.h: add comment and clarify repo_set_gitdir
        repository: delete ignore_env member
        sha1_file.c: move delayed getenv(altdb) back to setup_git_env()
        repository.c: delete dead functions
        repository.c: move env-related setup code back to environment.c
        repository: initialize the_repository in main()
      0873c393
    • Junio C Hamano's avatar
      Merge branch 'ps/contains-id-error-message' · 62c0fd46
      Junio C Hamano authored
      "git tag --contains no-such-commit" gave a full list of options
      after giving an error message.
      
      * ps/contains-id-error-message:
        parse-options: do not show usage upon invalid option value
      62c0fd46
  4. 09 Apr, 2018 3 commits
    • Junio C Hamano's avatar
      The first batch for 2.18 cycle · 69d71ec4
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      69d71ec4
    • Junio C Hamano's avatar
      Merge branch 'tg/stash-untracked-with-pathspec-fix' · cbf03394
      Junio C Hamano authored
      "git stash push -u -- <pathspec>" gave an unnecessary and confusing
      error message when there was no tracked files that match the
      <pathspec>, which has been fixed.
      
      * tg/stash-untracked-with-pathspec-fix:
        stash: drop superfluos pathspec parameter
        stash push -u: don't create empty stash
        stash push: avoid printing errors
        stash: fix nonsense pipeline
      cbf03394
    • Junio C Hamano's avatar
      Merge branch 'nd/worktree-prune' · ca923f72
      Junio C Hamano authored
      The way "git worktree prune" worked internally has been simplified,
      by assuming how "git worktree move" moves an existing worktree to a
      different place.
      
      * nd/worktree-prune:
        worktree prune: improve prune logic when worktree is moved
        worktree: delete dead code
        gc.txt: more details about what gc does
      ca923f72