diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-19 14:41:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-19 14:41:25 -0700 |
| commit | 5a30374a29a4ee9725d6ea165ead19a748eaed4c (patch) | |
| tree | 7027cad79019819a66c130d9764ec92544d69bf3 | |
| parent | e88b8586bfd967cbfec62359cf4c53ec65848054 (diff) | |
| parent | e7aac44ed276bc0de0253baa8e3f5ac247044a31 (diff) | |
| download | git-5a30374a29a4ee9725d6ea165ead19a748eaed4c.tar.gz | |
Merge branch 'da/subtree-date-confusion' into maint
"git subtree" (in contrib/) depended on "git log" output to be
stable, which was a no-no. Apply a workaround to force a
particular date format.
* da/subtree-date-confusion:
contrib/subtree: ignore log.date configuration
| -rwxr-xr-x | contrib/subtree/git-subtree.sh | 2 | ||||
| -rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 07bd77c4c8..9f06571851 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -305,7 +305,7 @@ copy_commit() # We're going to set some environment vars here, so # do it in a subshell to get rid of them safely later debug copy_commit "{$1}" "{$2}" "{$3}" - git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%B' "$1" | + git log -1 --pretty=format:'%an%n%ae%n%aD%n%cn%n%ce%n%cD%n%B' "$1" | ( read GIT_AUTHOR_NAME read GIT_AUTHOR_EMAIL diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index bd3df97936..90519823be 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -94,6 +94,10 @@ test_expect_success 'add sub3' ' # Back to mainline cd .. +test_expect_success 'enable log.date=relative to catch errors' ' + git config log.date relative +' + test_expect_success 'add main4' ' create main4 && git commit -m "main4" && |