mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
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).
This commit is contained in:
parent
00889c8ca7
commit
6fe986307d
1 changed files with 2 additions and 2 deletions
4
test.sh
4
test.sh
|
@ -73,7 +73,7 @@ undo()
|
||||||
|
|
||||||
last_commit_message()
|
last_commit_message()
|
||||||
{
|
{
|
||||||
git log --format=%s -1
|
git log --pretty=format:%s -1
|
||||||
}
|
}
|
||||||
|
|
||||||
rm -rf mainline subproj
|
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
|
# 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,
|
# 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)
|
# 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)"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue