Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
fixed order of assertion in tests
author
Amiel Martin
<amiel.martin@gmail.com>
Wed, 12 Aug 2009 22:24:50 +0000
(15:24 -0700)
committer
Amiel Martin
<amiel.martin@gmail.com>
Wed, 12 Aug 2009 22:25:18 +0000
(15:25 -0700)
test.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
ef75966
)
diff --git
a/test.sh
b/test.sh
index 38dff7a41af25e109069ca63d44d481bd6678742..4229f840ac1e25669fb40825f0508766d285c716 100755
(executable)
--- a/
test.sh
+++ b/
test.sh
@@
-160,7
+160,7
@@
check_equal "$mainfiles" "$chkm $chkms_sub $chks_sub"
# changes that were split into their own history. And 'subdir/sub??' never
# change, since they were *only* changed in the subtree branch.
allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
# changes that were split into their own history. And 'subdir/sub??' never
# change, since they were *only* changed in the subtree branch.
allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
-check_equal "$allchanges" "$chkm
$chkms
$chks $chkms_sub"
+check_equal "$allchanges" "$chkm
s $chkm
$chks $chkms_sub"
# make sure the --rejoin commits never make it into subproj
check_equal "$(git log --pretty=format:'%s' HEAD^2 | grep -i split)" ""
# make sure the --rejoin commits never make it into subproj
check_equal "$(git log --pretty=format:'%s' HEAD^2 | grep -i split)" ""