Skip to content
Commits on Feb 8, 2016
  1. @gitster

    Merge branch 'js/mingw-tests' into next

    gitster committed
    * js/mingw-tests:
      gitignore: ignore generated test-fake-ssh executable
  2. @dscho @gitster

    gitignore: ignore generated test-fake-ssh executable

    dscho committed with gitster
    In "mingw: fix t5601-clone.sh", this developer introduced a new test
    executable, test-fake-ssh but forgot to update the .gitignore file
    accordingly. Fix that.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 5, 2016
  1. @gitster

    Merge branch 'master' into next

    gitster committed
    * master:
      Git 2.7.1
  2. @gitster

    Sync with 2.7.1

    gitster committed
  3. @gitster

    Git 2.7.1

    gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'lv/add-doc-working-tree' into maint

    gitster committed
    * lv/add-doc-working-tree:
      git-add doc: do not say working directory when you mean working tree
  5. @gitster

    Merge branch 'ss/clone-depth-single-doc' into maint

    gitster committed
    Documentation for "git fetch --depth" has been updated for clarity.
    
    * ss/clone-depth-single-doc:
      docs: clarify that --depth for git-fetch works with newly initialized repos
      docs: say "commits" in the --depth option wording for git-clone
      docs: clarify that passing --depth to git-clone implies --single-branch
  6. @gitster

    Merge branch 'sg/t6050-failing-editor-test-fix' into maint

    gitster committed
    * sg/t6050-failing-editor-test-fix:
      t6050-replace: make failing editor test more robust
  7. @gitster

    Merge branch 'ew/for-each-ref-doc' into maint

    gitster committed
    * ew/for-each-ref-doc:
      for-each-ref: document `creatordate` and `creator` fields
  8. @gitster

    Merge branch 'ss/user-manual' into maint

    gitster committed
    Drop a few old "todo" items by deciding that the change one of them
    suggests is not such a good idea, and doing the change the other
    one suggested to do.
    
    * ss/user-manual:
      user-manual: add addition gitweb information
      user-manual: add section documenting shallow clones
      glossary: define the term shallow clone
      user-manual: remove temporary branch entry from todo list
  9. @gitster

    Merge branch 'jk/ref-cache-non-repository-optim' into maint

    gitster committed
    The underlying machinery used by "ls-files -o" and other commands
    have been taught not to create empty submodule ref cache for a
    directory that is not a submodule.  This removes a ton of wasted
    CPU cycles.
    
    * jk/ref-cache-non-repository-optim:
      resolve_gitlink_ref: ignore non-repository paths
      clean: make is_git_repository a public function
  10. @gitster

    Merge branch 'js/dirname-basename' into maint

    gitster committed
    dirname() emulation has been added, as Msys2 lacks it.
    
    * js/dirname-basename:
      mingw: avoid linking to the C library's isalpha()
      t0060: loosen overly strict expectations
      t0060: verify that basename() and dirname() work as expected
      compat/basename.c: provide a dirname() compatibility function
      compat/basename: make basename() conform to POSIX
      Refactor skipping DOS drive prefixes
  11. @gitster

    Merge branch 'tb/complete-word-diff-regex' into maint

    gitster committed
    * tb/complete-word-diff-regex:
      completion: complete "diff --word-diff-regex="
  12. @gitster

    Merge branch 'pw/completion-stash' into maint

    gitster committed
    * pw/completion-stash:
      completion: update completion arguments for stash
  13. @gitster

    Merge branch 'pw/completion-show-branch' into maint

    gitster committed
    * pw/completion-show-branch:
      completion: complete show-branch "--date-order"
  14. @gitster

    Merge branch 'jk/completion-rebase' into maint

    gitster committed
    * jk/completion-rebase:
      completion: add missing git-rebase options
  15. @gitster

    Merge branch 'nd/diff-with-path-params' into maint

    gitster committed
    A few options of "git diff" did not work well when the command was
    run from a subdirectory.
    
    * nd/diff-with-path-params:
      diff: make -O and --output work in subdirectory
      diff-no-index: do not take a redundant prefix argument
  16. @gitster

    Merge branch 'dw/subtree-split-do-not-drop-merge' into maint

    gitster committed
    The "split" subcommand of "git subtree" (in contrib/) incorrectly
    skipped merges when it shouldn't, which was corrected.
    
    * dw/subtree-split-do-not-drop-merge:
      contrib/subtree: fix "subtree split" skipped-merge bug
  17. @gitster

    Merge branch 'ew/svn-1.9.0-auth' into maint

    gitster committed
    * ew/svn-1.9.0-auth:
      git-svn: fix auth parameter handling on SVN 1.9.0+
  18. @gitster

    Merge branch 'jk/list-tag-2.7-regression' into maint

    gitster committed
    "git tag" started listing a tag "foo" as "tags/foo" when a branch
    named "foo" exists in the same repository; remove this unnecessary
    disambiguation, which is a regression introduced in v2.7.0.
    
    * jk/list-tag-2.7-regression:
      tag: do not show ambiguous tag names as "tags/foo"
      t6300: use test_atom for some un-modern tests
  19. @gitster

    Merge branch 'jk/sanity' into maint

    gitster committed
    The description for SANITY prerequisite the test suite uses has
    been clarified both in the comment and in the implementation.
    
    * jk/sanity:
      test-lib: clarify and tighten SANITY
  20. @gitster

    Merge branch 'jk/filter-branch-no-index' into maint

    gitster committed
    A recent optimization to filter-branch in v2.7.0 introduced a
    regression when --prune-empty filter is used, which has been
    corrected.
    
    * jk/filter-branch-no-index:
      filter-branch: resolve $commit^{tree} in no-index case
  21. @gitster

    Merge branch 'js/close-packs-before-gc' into maint

    gitster committed
    Many codepaths that run "gc --auto" before exiting kept packfiles
    mapped and left the file descriptors to them open, which was not
    friendly to systems that cannot remove files that are open.  They
    now close the packs before doing so.
    
    * js/close-packs-before-gc:
      receive-pack: release pack files before garbage-collecting
      merge: release pack files before garbage-collecting
      am: release pack files before garbage-collecting
      fetch: release pack files before garbage-collecting
  22. @gitster

    Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into maint

    gitster committed
    "git rebase", unlike all other callers of "gc --auto", did not
    ignore the exit code from "gc --auto".
    
    * jk/ok-to-fail-gc-auto-in-rebase:
      rebase: ignore failures from "gc --auto"
  23. @gitster

    Merge branch 'ho/gitweb-squelch-undef-warning' into maint

    gitster committed
    Asking gitweb for a nonexistent commit left a warning in the server
    log.
    
    Somebody may want to follow this up with a new test, perhaps?
    IIRC, we do test that no Perl warnings are given to the server log,
    so this should have been caught if our test coverage were good.
    
    * ho/gitweb-squelch-undef-warning:
      gitweb: squelch "uninitialized value" warning
  24. @gitster

    Merge branch 'js/fopen-harder' into maint

    gitster committed
    Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR
    (e.g. COMMIT_EDITMSG) that is meant to be left after the command is
    done.  This however did not work well if the repository is set to
    be shared with core.sharedRepository and the umask of the previous
    user is tighter.  They have been made to work better by calling
    unlink(2) and retrying after fopen(3) fails with EPERM.
    
    * js/fopen-harder:
      Handle more file writes correctly in shared repos
      commit: allow editing the commit message even in shared repos
  25. @gitster

    Merge branch 'nd/exclusion-regression-fix' into maint

    gitster committed
    The ignore mechanism saw a few regressions around untracked file
    listing and sparse checkout selection areas in 2.7.0; the change
    that is responsible for the regression has been reverted.
    
    * nd/exclusion-regression-fix:
      Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"
  26. @gitster

    Merge branch 'dk/reflog-walk-with-non-commit' into maint

    gitster committed
    "git reflog" incorrectly assumed that all objects that used to be
    at the tip of a ref must be commits, which caused it to segfault.
    
    * dk/reflog-walk-with-non-commit:
      reflog-walk: don't segfault on non-commit sha1's in the reflog
  27. @gitster

    Merge branch 'dw/signoff-doc' into maint

    gitster committed
    The documentation has been updated to hint the connection between
    the '--signoff' option and DCO.
    
    * dw/signoff-doc:
      Expand documentation describing --signoff
  28. @gitster

    Merge branch 'jk/clang-pedantic' into maint

    gitster committed
    A few unportable C construct have been spotted by clang compiler
    and have been fixed.
    
    * jk/clang-pedantic:
      bswap: add NO_UNALIGNED_LOADS define
      avoid shifting signed integers 31 bits
  29. @gitster

    Merge branch 'ew/send-email-mutt-alias-fix' into maint

    gitster committed
    "git send-email" was confused by escaped quotes stored in the alias
    files saved by "mutt", which has been corrected.
    
    * ew/send-email-mutt-alias-fix:
      git-send-email: do not double-escape quotes from mutt
  30. @gitster

    Merge branch 'nd/dir-exclude-cleanup' into maint

    gitster committed
    The "exclude_list" structure has the usual "alloc, nr" pair of
    fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
    to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
    array.
    
    * nd/dir-exclude-cleanup:
      dir.c: clean the entire struct in clear_exclude_list()
  31. @gitster

    Merge branch 'nd/stop-setenv-work-tree' into maint

    gitster committed
    An earlier change in 2.5.x-era broke users' hooks and aliases by
    exporting GIT_WORK_TREE to point at the root of the working tree,
    interfering when they tried to use a different working tree without
    setting GIT_WORK_TREE environment themselves.
    
    * nd/stop-setenv-work-tree:
      Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR"
Commits on Feb 4, 2016
  1. @gitster

    Merge branch 'js/test-lib-windows-emulated-yes' into next

    gitster committed
    The emulated "yes" command used in our test scripts has been
    tweaked not to spend too much time generating unnecessary output
    that is not used, to help those who test on Windows where it would
    not stop until it fills the pipe buffer due to lack of SIGPIPE.
    
    * js/test-lib-windows-emulated-yes:
      test-lib: limit the output of the yes utility
  2. @gitster

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

    gitster committed
    A new "<branch>^{/!-<pattern>}" notation can be used to name a
    commit that is reachable from <branch> that does not match the
    given <pattern>.
    
    * wp/sha1-name-negative-match:
      object name: introduce '^{/!-<negative pattern>}' notation
      test for '!' handling in rev-parse's named commits
Something went wrong with that request. Please try again.