From e7aac44ed276bc0de0253baa8e3f5ac247044a31 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Tue, 21 Jul 2015 17:01:02 -0700 Subject: contrib/subtree: ignore log.date configuration 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 Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/subtree/t/t7900-subtree.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib/subtree/t/t7900-subtree.sh') diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 6309d124ca..da709f96e5 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" && -- cgit v1.2.3