From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 18:01:31 +0000 (-0700)
Subject: Merge branch 'da/subtree-date-confusion'
X-Git-Tag: v2.6.0-rc0~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a06e63f821069fe959cdfe16592d9678eee06e4;p=thirdparty%2Fgit.git

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
---

7a06e63f821069fe959cdfe16592d9678eee06e4
diff --cc contrib/subtree/t/t7900-subtree.sh
index bd3df97936,da709f96e5..90519823be
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@@ -94,11 -94,15 +94,15 @@@ 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" &&
 -        git branch -m master mainline &&
 -        git branch subdir
 +	create main4 &&
 +	git commit -m "main4" &&
 +	git branch -m master mainline &&
 +	git branch subdir
  '
  
  test_expect_success 'fetch subproj history' '