summaryrefslogtreecommitdiff
path: root/contrib/subtree/git-subtree.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-03 18:01:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-03 18:01:31 (GMT)
commit7a06e63f821069fe959cdfe16592d9678eee06e4 (patch)
tree62f92b6c50fe542a977e3eff142c7595bae040a2 /contrib/subtree/git-subtree.sh
parent0baebca51eba05dd3c3e9edf18fc49c67b55503f (diff)
parente7aac44ed276bc0de0253baa8e3f5ac247044a31 (diff)
downloadgit-7a06e63f821069fe959cdfe16592d9678eee06e4.zip
git-7a06e63f821069fe959cdfe16592d9678eee06e4.tar.gz
git-7a06e63f821069fe959cdfe16592d9678eee06e4.tar.bz2
Merge branch 'da/subtree-date-confusion'
"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
Diffstat (limited to 'contrib/subtree/git-subtree.sh')
-rwxr-xr-xcontrib/subtree/git-subtree.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 07bd77c..9f06571 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