git/t, branch v2.0.4

commit --amend: test specifies authorship but forgets to check

2014-07-30T18:32:12Z

The test case "--amend option copies authorship" specifies that the git-commit option `--amend` uses the authorship of the replaced commit for the new commit. Add the omitted check that this property actually holds. Signed-off-by: Fabian Ruch Signed-off-by: Junio C Hamano

t4013: test diff-tree's --stdin commit formatting

2014-07-28T18:31:32Z

Once upon a time, git-log was just "rev-list | diff-tree", and we did not bother to test it separately. These days git-log is implemented internally, but we want to make sure that the rev-list to diff-tree pipeline continues to function. Let's add a basic sanity test. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'zk/log-graph-showsig' into maint

2014-07-22T17:28:51Z

* zk/log-graph-showsig: log: fix indentation for --graph --show-signature

Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint

2014-07-22T17:28:30Z

* cb/filter-branch-prune-empty-degenerate-merges: filter-branch: eliminate duplicate mapped parents

Merge branch 'jm/dedup-test-config' into maint

2014-07-22T17:26:45Z

* jm/dedup-test-config: t/t7810-grep.sh: remove duplicate test_config()

Merge branch 'sk/test-cmp-bin' into maint

2014-07-22T17:26:34Z

* sk/test-cmp-bin: t5000, t5003: do not use test_cmp to compare binary files

Merge branch 'lt/request-pull' into maint

2014-07-22T17:23:41Z

* lt/request-pull: fix brown paper bag breakage in t5150-request-pull.sh

Merge branch 'ep/shell-assign-and-export-vars' into maint

2014-07-22T17:22:57Z

* 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 maint

2014-07-16T18:17:21Z

"%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 maint

2014-07-16T18:16:16Z

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