Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.7.2 2016-02-17T18:03:41Z 2016-02-17T18:03:41Z Junio C Hamano gitster@pobox.com 2016-02-17T18:03:41Z urn:sha1:7516977b4adc38937d95d8c7da8944153784bf9a 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 2016-02-17T18:03:40Z Junio C Hamano gitster@pobox.com 2016-02-17T18:03:40Z urn:sha1:0eefe108ec2a946e40072caf58c52e3b7f573e52 "git push --force-with-lease" has been taught to report if the push needed to force (or fast-forwarded). * aw/push-force-with-lease-reporting: push: fix ref status reporting for --force-with-lease 2016-02-17T18:03:39Z Junio C Hamano gitster@pobox.com 2016-02-17T18:03:39Z urn:sha1:ab2c107eab77a7879574992752a3ac96421bef34 The low-level merge machinery has been taught to use CRLF line termination when inserting conflict markers to merged contents that are themselves CRLF line-terminated. * js/xmerge-marker-eol: merge-file: ensure that conflict sections match eol style merge-file: let conflict markers match end-of-line style of the context 2016-02-05T22:54:21Z Junio C Hamano gitster@pobox.com 2016-02-05T22:54:20Z urn:sha1:0298675ac41520aa825ff347086f449a4d2af22e * sg/t6050-failing-editor-test-fix: t6050-replace: make failing editor test more robust 2016-02-05T22:54:17Z Junio C Hamano gitster@pobox.com 2016-02-05T22:54:17Z urn:sha1:e2d7739051cadf25094c3fc7593b73b30c680696 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 2016-02-05T22:54:17Z Junio C Hamano gitster@pobox.com 2016-02-05T22:54:17Z urn:sha1:07be1da216debe1f76cd4d03ac5effcb9e40e6c6 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 2016-02-05T22:54:15Z Junio C Hamano gitster@pobox.com 2016-02-05T22:54:15Z urn:sha1:02dab5d399fb276f91646d7780da90596bffefab 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 2016-02-05T22:54:15Z Junio C Hamano gitster@pobox.com 2016-02-05T22:54:15Z urn:sha1:88ec75dba425be4a18309f28a8c5ae01044fd29a "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 2016-02-05T22:54:14Z Junio C Hamano gitster@pobox.com 2016-02-05T22:54:14Z urn:sha1:913c2c7c7be358144260bc81112e548d3276d694 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 2016-02-05T22:54:13Z Junio C Hamano gitster@pobox.com 2016-02-05T22:54:13Z urn:sha1:16f5e2683304b986be49a919198d04652a126271 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