From: Avery Pennarun <apenwarr@gmail.com>
Date: Tue, 9 Feb 2010 00:44:41 +0000 (-0500)
Subject: Some recent tests accidentally depended on very new versions of git.
X-Git-Tag: v1.7.11-rc0~176^2~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6fe986307d983704d3c6b3540f91fa301ff48549;p=git.git

Some recent tests accidentally depended on very new versions of git.

The "--format" option is too new.  Use "--pretty=format:" (which means the
same thing) instead.  Now it works again on git 1.6.0 (at least).
---

diff --git a/test.sh b/test.sh
index c6ecde20b..8c1f1ea6b 100755
--- a/test.sh
+++ b/test.sh
@@ -73,7 +73,7 @@ undo()
 
 last_commit_message()
 {
-	git log --format=%s -1
+	git log --pretty=format:%s -1
 }
 
 rm -rf mainline subproj
@@ -292,7 +292,7 @@ git subtree split --prefix subdir --branch mainsub4
 # at this point, the new commit's parent should be sub3
 # if it's not, something went wrong (the "newparent" of "master~" commit should have been sub3,
 # but it wasn't, because it's cache was not set to itself)
-check_equal "$(git log --format=%P -1 mainsub4)" "$(git rev-parse sub3)"
+check_equal "$(git log --pretty=format:%P -1 mainsub4)" "$(git rev-parse sub3)"