| commit | e7aac44ed276bc0de0253baa8e3f5ac247044a31 | |
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 22 Jul 2015 00:01:02 +0000 (21 17:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Jul 2015 22:08:41 +0000 (23 15:08 -0700) | ||
| tree | 3d4b5d2233ee0efe48cb50b147bcf0d1c13074e7 | treesnapshot (tar.gz zip) |
| parent | bb3e7b1a5505bae590b0d85a3995a61d6dd82547 | commitdiff |
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 <b@q3q.us>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <b@q3q.us>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/subtree/git-subtree.sh | diffblobblamehistory | |
| contrib/subtree/t/t7900-subtree.sh | diffblobblamehistory |