git/t, branch v2.0.3Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.0.32014-07-22T17:28:51ZMerge branch 'zk/log-graph-showsig' into maint2014-07-22T17:28:51ZJunio C Hamanogitster@pobox.com2014-07-22T17:28:51Zurn:sha1:a1991f173460d4cc3bffecf4e2840ab74a8f3291
* zk/log-graph-showsig:
log: fix indentation for --graph --show-signature
Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint2014-07-22T17:28:30ZJunio C Hamanogitster@pobox.com2014-07-22T17:28:30Zurn:sha1:5796c5baa3ef0a7d179fdac6cb5815f75f65fd53
* cb/filter-branch-prune-empty-degenerate-merges:
filter-branch: eliminate duplicate mapped parents
Merge branch 'jm/dedup-test-config' into maint2014-07-22T17:26:45ZJunio C Hamanogitster@pobox.com2014-07-22T17:26:45Zurn:sha1:054e22caf4962d6079b9aa1c5add69b02124db9d
* jm/dedup-test-config:
t/t7810-grep.sh: remove duplicate test_config()
Merge branch 'sk/test-cmp-bin' into maint2014-07-22T17:26:34ZJunio C Hamanogitster@pobox.com2014-07-22T17:26:34Zurn:sha1:ef937140a602bccea6f36235f1f7f926a90b85f2
* sk/test-cmp-bin:
t5000, t5003: do not use test_cmp to compare binary files
Merge branch 'lt/request-pull' into maint2014-07-22T17:23:41ZJunio C Hamanogitster@pobox.com2014-07-22T17:23:41Zurn:sha1:85dd37941a10583273ea80d476eca8187004f6d0
* lt/request-pull:
fix brown paper bag breakage in t5150-request-pull.sh
Merge branch 'ep/shell-assign-and-export-vars' into maint2014-07-22T17:22:57ZJunio C Hamanogitster@pobox.com2014-07-22T17:22:57Zurn:sha1:63618af24a67e5fc959217201d9f220383a39fd0
* ep/shell-assign-and-export-vars:
scripts: more "export VAR=VALUE" fixes
scripts: "export VAR=VALUE" construct is not portable
Merge branch 'jk/pretty-G-format-fixes' into maint2014-07-16T18:17:21ZJunio C Hamanogitster@pobox.com2014-07-16T18:17:21Zurn:sha1:588de86f06c897713d0a6b362629ff7d4911dd7c
"%G" (nothing after G) is an invalid pretty format specifier, but
the parser did not notice it as garbage.
* jk/pretty-G-format-fixes:
move "%G" format test from t7510 to t6006
pretty: avoid reading past end-of-string with "%G"
t7510: check %G* pretty-format output
t7510: test a commit signed by an unknown key
t7510: use consistent &&-chains in loop
t7510: stop referring to master in later tests
Merge branch 'bc/fix-rebase-merge-skip' into maint2014-07-16T18:16:16ZJunio C Hamanogitster@pobox.com2014-07-16T18:16:16Zurn:sha1:64630d807ae0a9717ae39c87bd1458bf15c62142
During "git rebase --merge", a conflicted patch could not be
skipped with "--skip" if the next one also conflicted.
* bc/fix-rebase-merge-skip:
rebase--merge: fix --skip with two conflicts in a row
Merge branch 'pb/trim-trailing-spaces' into maint2014-07-10T18:10:52ZJunio C Hamanogitster@pobox.com2014-07-10T18:10:52Zurn:sha1:cbf4e024ad021501f2c1824b8ae5f7b887a652f1
* pb/trim-trailing-spaces:
t0008: do not depend on 'echo' handling backslashes specially
dir.c:trim_trailing_spaces(): fix for " \ " sequence
Merge branch 'jk/repack-pack-keep-objects' into maint2014-07-10T18:10:05ZJunio C Hamanogitster@pobox.com2014-07-10T18:10:05Zurn:sha1:f35392b0188ce5ac1711be37dca773a85cb32863
* jk/repack-pack-keep-objects:
repack: s/write_bitmap/&s/ in code
repack: respect pack.writebitmaps
repack: do not accidentally pack kept objects by default