Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Aug 3, 2015
  1. @gitster

    Merge branch 'dt/untracked-sparse' into pu

    gitster authored
    Allow untracked cache (experimental) to be used when sparse
    checkout (experimental) is also in use.
    * dt/untracked-sparse:
      untracked-cache: support sparse checkout
  2. @gitster

    Merge branch 'mh/tempfile' into pu

    gitster authored
    Rebuild "lockfile" API on top of a new "tempfile" API.
    This needs rerolling, to include "tempfile.h" in "lockfile.h", at
    * mh/tempfile:
      credential-cache--daemon: use tempfile module
      credential-cache--daemon: delete socket from main()
      gc: use tempfile module to handle file
      lock_repo_for_gc(): compute the path to "" only once
      diff: use tempfile module
      setup_temporary_shallow(): use tempfile module
      write_shared_index(): use tempfile module
      register_tempfile(): new function to handle an existing temporary file
      tempfile: add several functions for creating temporary files
      register_tempfile_object(): new function, extracted from create_tempfile()
      commit_lock_file(): use get_locked_file_path()
      lockfile: remove some redundant functions
      tempfile: a new module for handling temporary files
      Move lockfile API documentation to lockfile.h
  3. @gitster

    Merge branch 'ak/format-patch-odir-config' into pu

    gitster authored
    Reroll exists but didn't pick it up as it seemed to be still
    collecting review comments.
    * ak/format-patch-odir-config:
      format-patch: introduce format.outputDirectory configuration
  4. @gitster

    Merge branch 'wp/sha1-name-negative-match' into pu

    gitster authored
    Introduce "branch^{/!-<pattern>}" notation to name a commit
    reachable from branch that does not match the given pattern.
    * wp/sha1-name-negative-match:
      sha1_name.c: introduce '^{/!-<negative pattern>}' notation
      test for '!' handling in rev-parse's named commits
  5. @gitster

    Merge branch 'mk/utf8-no-iconv-warn' into pu

    gitster authored
    Warn when a reencoding is requested in a build without iconv
    support, as the end user is likely to get an unexpected result.  I
    think the same level of safety should be added to a build with
    iconv support when the specified encoding is not available, but the
    patch does not go there.
    * mk/utf8-no-iconv-warn:
      utf8.c: print warning about disabled iconv
  6. @gitster

    Merge branch 'mg/index-read-error-messages' into pu

    gitster authored
    The tip was RFC.
    * mg/index-read-error-messages:
      messages: uniform error messages for index write
      show-index: uniform error messages for index read
  7. @gitster

    Merge branch 'jc/clone-bundle' into pu

    gitster authored
    Still an early WIP.
    * jc/clone-bundle:
      repack: optionally create a clone.bundle
  8. @gitster

    Merge branch 'jc/diff-b-m' (early part) into pu

    gitster authored
    * 'jc/diff-b-m' (early part):
      diffcore-rename: allow easier debugging
      diffcore-rename.c: add locate_rename_src()
      diffcore-break: allow debugging
  9. @gitster

    Merge branch 'jc/show-branch' into pu

    gitster authored
    * jc/show-branch:
      show-branch: use commit slab to represent bitflags of arbitrary width
      show-branch.c: remove "all_mask"
      show-branch.c: abstract out "flags" operation
      show-branch.c: lift all_mask/all_revs to a global static
      show-branch.c: update comment style
  10. @gitster

    Merge branch 'nd/list-files' into pu

    gitster authored
    A new "git list-files" Porcelain command, "ls-files" with bells and
    Reroll to base on wt-status work ($gmane/265142) has seen some
    positive discussions.
    * nd/list-files: (21 commits)
      t3080: tests for git-list-files
      list-files: -M aka diff-cached
      list-files -F: show submodules with the new indicator '&'
      list-files: add -F/--classify
      list-files: show directories as well as files
      list-files: do not show duplicate cached entries
      list-files: sort output and remove duplicates
      list-files: add -t back
      list-files: add -1 short for --no-column
      list-files: add -R/--recursive short for --max-depth=-1
      list-files: -u does not imply showing stages
      list-files: make alias 'ls' default to 'list-files'
      list-files: a user friendly version of ls-files and more
      ls-files: support --max-depth
      ls-files: add --column
      ls-files: add --color to highlight file names
      ls-files: buffer full item in strbuf before printing
      ls_colors.c: highlight submodules like directories
      ls_colors.c: add a function to color a file name
      ls_colors.c: parse* from config file
  11. @gitster

    Merge branch 'tr/remerge-diff' into pu

    gitster authored
    "log -p" output learns a new way to let users inspect a merge
    commit by showing the differences between the automerged result
    with conflicts the person who recorded the merge would have seen
    and the final conflict resolution that was recorded in the merge.
    * tr/remerge-diff:
      t4213: avoid "|" in sed regexp
      log --remerge-diff: show what the conflict resolution changed
      name-hash: allow dir hashing even when !ignore_case
      merge-recursive: allow storing conflict hunks in index
      merge_diff_mode: fold all merge diff variants into an enum
      combine-diff: do not pass revs->dense_combined_merges redundantly
      merge-recursive: -Xindex-only to leave worktree unchanged
      merge-recursive: internal flag to avoid touching the worktree
      merge-recursive: remove dead conditional in update_stages()
  12. @gitster

    Merge branch 'mg/httpd-tests-update-for-apache-2.4' into pu

    gitster authored
    This is the first two commits in a three-patch series $gmane/266962
    with updated log message ($gmane/268061).
    * mg/httpd-tests-update-for-apache-2.4:
      t/lib-git-svn: check same httpd module dirs as lib-httpd
      t/lib-httpd: load mod_unixd
  13. @gitster

    Merge branch 'tg/perf-lib-test-perf-cleanup' into pu

    gitster authored
    Add test_perf_cleanup shell function to the perf suite, that allows
    the script writers to define a test with a clean-up action.
    Will hold.
    * tg/perf-lib-test-perf-cleanup:
      perf-lib: add test_perf_cleanup target
      perf-lib: split starting the test from the execution
  14. @gitster

    Merge branch 'pw/remote-set-url-fetch' into pu

    gitster authored
    * pw/remote-set-url-fetch:
      remote: add --fetch and --both options to set-url
  15. @gitster

    Merge branch 'jh/strbuf-read-use-read-in-full' into pu

    gitster authored
    Avoid one extra iteration and strbuf_grow() of 8kB in
    Looked reasonable; perhaps a log message clarification is needed.
    * jh/strbuf-read-use-read-in-full:
      strbuf_read(): skip unnecessary strbuf_grow() at eof
  16. @gitster

    Merge branch 'sg/config-name-only' into pu

    gitster authored
    "git config --list" output was hard to parse when values consist of
    multiple lines.  Introduce a way to show only the keys.
    Adding a single --name-only option may be a better way to go than
    adding two new options.
    * sg/config-name-only:
      completion: use new 'git config' options to reliably list variable names
      config: add options to list only variable names
  17. @gitster

    Merge branch 'kk/log-merges-config' into pu

    gitster authored
    "git log" (but not other commands in the "log" family) learned to
    pay attention to the log.merges configuration variable that can be
    set to "show" (the normal behaviour), "only" (hide non-merge
    commits), or "hide" (hide merge commits).  --merges=(show|only|hide)
    can be used to override the setting from the command line.
    The documentation may need to be updated once more ($gmane/267250).
    * kk/log-merges-config:
      bash-completion: add support for git-log --merges= and log.merges
      t4202-log: add tests for --merges=
      Documentation: add git-log --merges= option and log.merges config. var
      log: honor log.merges= option
      revision: add --merges={show|only|hide} option
  18. @gitster

    Merge branch 'mh/notes-allow-reading-treeish' into pu

    gitster authored
    Some "git notes" operations, e.g. "git log --notes=<note>", should
    be able to read notes from any tree-ish that is shaped like a notes
    tree, but the notes infrastructure required that the argument must
    be a ref under refs/notes/.  Loosen it to require a valid ref only
    when the operation would update the notes (in which case we must
    have a place to store the updated notes tree, iow, a ref).
    * mh/notes-allow-reading-treeish:
      notes: allow treeish expressions as notes ref
  19. @gitster

    Merge branch 'dt/notes-multiple' into pu

    gitster authored
    * dt/notes-multiple:
      notes: handle multiple worktrees
      worktrees: add find_shared_symref
  20. @dturner-tw @gitster

    notes: handle multiple worktrees

    dturner-tw authored gitster committed
    Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using
    find_shared_symref and die if we find one.  This prevents simultaneous
    merges to the same notes branch from different worktrees.
    Signed-off-by: David Turner <>
    Signed-off-by: Junio C Hamano <>
  21. @dturner-tw @gitster

    worktrees: add find_shared_symref

    dturner-tw authored gitster committed
    Add a new function, find_shared_symref, which contains the heart of
    die_if_checked_out, but works for any symref, not just HEAD.  Refactor
    die_if_checked_out to use the same infrastructure as
    Soon, we will use find_shared_symref to protect notes merges in
    Signed-off-by: David Turner <>
    Signed-off-by: Junio C Hamano <>
  22. @gitster

    Merge branch 'sb/check-return-from-read-ref' into jch

    gitster authored
    * sb/check-return-from-read-ref:
      transport-helper: die on errors reading refs.
  23. @stefanbeller @gitster

    transport-helper: die on errors reading refs.

    stefanbeller authored gitster committed
    We check the return value of read_ref in 19 out of 21 cases.
    This adds checks to the missing cases.
    Signed-off-by: Stefan Beller <>
    Signed-off-by: Junio C Hamano <>
  24. @gitster

    Merge branch 'jc/rerere-multi' (early part) into jch

    gitster authored
    * 'jc/rerere-multi' (early part):
      rerere: delay the recording of preimage
      rerere: handle leftover rr-cache/$ID directory and postimage files
      rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
      rerere: split conflict ID further
  25. @gitster

    Merge branch 'jk/negative-hiderefs' into jch

    gitster authored
    Allow negative !ref entry in multi-value transfer.hideRefs
    configuration to say "don't hide this one".
    An update to test coming?
    * jk/negative-hiderefs:
      refs: support negative transfer.hideRefs
      docs/config.txt: reorder hideRefs config
  26. @gitster

    Merge branch 'mh/get-remote-group-fix' into jch

    gitster authored
    An off-by-one error made "git remote" to mishandle a remote with a
    single letter nickname.
    * mh/get-remote-group-fix:
      get_remote_group(): use skip_prefix()
      get_remote_group(): eliminate superfluous call to strcspn()
      get_remote_group(): rename local variable "space" to "wordlen"
      get_remote_group(): handle remotes with single-character names
  27. @gitster

    Merge branch 'pt/am-builtin-fix' into jch

    gitster authored
    With "git am --options" followed by "git am --other-options", the
    options given in a later invocation should override the initial
    options for a single invocation, but the rewritten "git am" didn't.
    * pt/am-builtin-fix:
      am: let command-line options override saved options
  28. @gitster

    Merge branch 'ta/docfix-index-format-tech' into jch

    gitster authored
    * ta/docfix-index-format-tech:
      typofix for index-format.txt
  29. @gitster

    Merge branch 'kd/pull-rebase-autostash' into jch

    gitster authored
    Teach "git pull --rebase" to pay attention to rebase.autostash
    Will hold until the dependant topics graduates and then rebase to
    'master' after that.
    * kd/pull-rebase-autostash:
      pull: allow dirty tree when rebase.autostash enabled
  30. @gitster

    Merge branch 'bw/portability-solaris' into jch

    gitster authored
    * bw/portability-solaris:
      tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
      tests: fix sed usage in tests to work around broken xpg4/sed on Solaris
      tests: modify tr expressions so that xpg4/tr handles it on Solaris
  31. @gitster

    Merge branch 'jc/rerere' into jch

    gitster authored
    Code clean-up and minor fixes (so far).
    * jc/rerere: (21 commits)
      rerere: un-nest merge() further
      rerere: use "struct rerere_id" instead of "char *" for conflict ID
      rerere: call conflict-ids IDs
      rerere: further clarify do_rerere_one_path()
      rerere: further de-dent do_plain_rerere()
      rerere: refactor "replay" part of do_plain_rerere()
      rerere: explain the remainder
      rerere: explain "rerere forget" codepath
      rerere: explain the primary codepath
      rerere: explain MERGE_RR management helpers
      rerere: fix benign off-by-one non-bug and clarify code
      rerere: explain the rerere I/O abstraction
      rerere: do not leak mmfile[] for a path with multiple stage #1 entries
      rerere: stop looping unnecessarily
      rerere: drop want_sp parameter from is_cmarker()
      rerere: report autoupdated paths only after actually updating them
      rerere: write out each record of MERGE_RR in one go
      rerere: lift PATH_MAX limitation
      rerere: plug conflict ID leaks
      rerere: handle conflicts with multiple stage #1 entries
  32. @gitster

    Merge branch 'ad/bisect-terms' into jch

    gitster authored
    The use of 'good/bad' in "git bisect" made it confusing to use when
    hunting for a state change that is not a regression (e.g. bugfix).
    The command learned 'old/new' and then allows the end user to
    say e.g. "bisect start --term-old=fast --term=new=slow" to find a
    performance regression.
    Michael's idea to make 'good/bad' more intelligent does have
    certain attractiveness ($gname/272867), and makes some of the work
    on this topic a moot point.
    Will hold.
    * ad/bisect-terms:
      bisect: allow setting any user-specified in 'git bisect start'
      bisect: add 'git bisect terms' to view the current terms
      bisect: add the terms old/new
      bisect: sanity check on terms
  33. @gitster

    Merge branch 'jk/log-missing-default-HEAD' into jch

    gitster authored
    "git init empty && git -C empty log" said "bad default revision 'HEAD'",
    which was found to be a bit confusing to new users.
    What's the status of this one?
    * jk/log-missing-default-HEAD:
      log: diagnose empty HEAD more clearly
  34. @gitster

    Merge branch 'hv/submodule-config' into jch

    gitster authored
    The gitmodules API accessed from the C code learned to cache stuff
    * hv/submodule-config:
      do not die on error of parsing fetchrecursesubmodules option
      use new config API for worktree configurations of submodules
      extract functions for submodule config set and lookup
      implement submodule config API for lookup of .gitmodules values
  35. @gitster

    Merge branch 'es/worktree-add-cleanup' into jch

    gitster authored
    Remove the "new-worktree-mode" hack in "checkout" that was added in
    nd/multiple-work-trees topic by updating the implementation of new
    "worktree add".
    * es/worktree-add-cleanup: (24 commits)
      Documentation/config: mention "now" and "never" for 'expire' settings
      Documentation/git-worktree: fix broken 'linkgit' invocation
      checkout: drop intimate knowledge of newly created worktree
      worktree: populate via "git reset --hard" rather than "git checkout"
      worktree: avoid resolving HEAD unnecessarily
      worktree: make setup of new HEAD distinct from worktree population
      worktree: detect branch-name/detached and error conditions locally
      worktree: add_worktree: construct worktree-population command locally
      worktree: elucidate environment variables intended for child processes
      worktree: make branch creation distinct from worktree population
      worktree: add: suppress auto-vivication with --detach and no <branch>
      worktree: make --detach mutually exclusive with -b/-B
      worktree: introduce options container
      worktree: simplify new branch (-b/-B) option checking
      worktree: improve worktree setup message
      branch: publish die_if_checked_out()
      checkout: teach check_linked_checkout() about symbolic link HEAD
      checkout: check_linked_checkout: simplify symref parsing
      checkout: check_linked_checkout: improve "already checked out" aesthetic
      checkout: generalize die_if_checked_out() branch name argument
Something went wrong with that request. Please try again.