contrib/subtree: ignore log.date configuration

davvid · gitster · commit e7aac44ed276 · 2015-07-23T15:08:41.000-07:00
git-subtree's log format string uses "%ad" and "%cd", which
respect the user's configured log.date value.

This is problematic for git-subtree because it needs to use real
dates so that copied commits come through unchanged.

Add a test and tweak the format strings to use %aD and %cD
so that the default date format is used instead.

Reported-by: Bryan Jacobs &lt;b@q3q.us&gt;
Signed-off-by: David Aguilar &lt;davvid@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
@@ -298,7 +298,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
@@ -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" &&

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ copy_commit()`
`298`	`298`	`# We're going to set some environment vars here, so`
`299`	`299`	`# do it in a subshell to get rid of them safely later`
`300`	`300`	`debug copy_commit "{$1}" "{$2}" "{$3}"`
`301`		`- git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%B' "$1" \|`
	`301`	`+ git log -1 --pretty=format:'%an%n%ae%n%aD%n%cn%n%ce%n%cD%n%B' "$1" \|`
`302`	`302`	`(`
`303`	`303`	`read GIT_AUTHOR_NAME`
`304`	`304`	`read GIT_AUTHOR_EMAIL`