aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xt/t1002-read-tree-m-u-2way.sh47
1 files changed, 32 insertions, 15 deletions
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index aebe21a6b..2f1ee7969 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -51,7 +51,7 @@ test_expect_success \
treeM=`git-write-tree` &&
echo treeM $treeM &&
git-ls-tree $treeM &&
- sha1sum bozbar frotz nitfol >M.sha1 &&
+ sum bozbar frotz nitfol >M.sum &&
git-diff-tree $treeH $treeM'
test_expect_success \
@@ -60,7 +60,8 @@ test_expect_success \
git-read-tree -m -u $treeH $treeM &&
git-ls-files --stage >1-3.out &&
cmp M.out 1-3.out &&
- sha1sum -c M.sha1 &&
+ sum bozbar frotz nitfol >actual3.sum &&
+ cmp M.sum actual3.sum &&
check_cache_at bozbar clean &&
check_cache_at frotz clean &&
check_cache_at nitfol clean'
@@ -76,7 +77,8 @@ test_expect_success \
diff --unified=0 M.out 4.out >4diff.out
compare_change 4diff.out expected &&
check_cache_at yomin clean &&
- sha1sum -c M.sha1 &&
+ sum bozbar frotz nitfol >actual4.sum &&
+ cmp M.sum actual4.sum &&
echo yomin >yomin1 &&
diff yomin yomin1 &&
rm -f yomin1'
@@ -92,7 +94,8 @@ test_expect_success \
diff --unified=0 M.out 5.out >5diff.out
compare_change 5diff.out expected &&
check_cache_at yomin dirty &&
- sha1sum -c M.sha1 &&
+ sum bozbar frotz nitfol >actual5.sum &&
+ cmp M.sum actual5.sum &&
: dirty index should have prevented -u from checking it out. &&
echo yomin yomin >yomin1 &&
diff yomin yomin1 &&
@@ -106,7 +109,8 @@ test_expect_success \
git-ls-files --stage >6.out &&
diff --unified=0 M.out 6.out &&
check_cache_at frotz clean &&
- sha1sum -c M.sha1 &&
+ sum bozbar frotz nitfol >actual3.sum &&
+ cmp M.sum actual3.sum &&
echo frotz >frotz1 &&
diff frotz frotz1 &&
rm -f frotz1'
@@ -121,7 +125,8 @@ test_expect_success \
git-ls-files --stage >7.out &&
diff --unified=0 M.out 7.out &&
check_cache_at frotz dirty &&
- if sha1sum -c M.sha1; then false; else :; fi &&
+ sum bozbar frotz nitfol >actual7.sum &&
+ if cmp M.sum actual7.sum; then false; else :; fi &&
: dirty index should have prevented -u from checking it out. &&
echo frotz frotz >frotz1 &&
diff frotz frotz1 &&
@@ -150,7 +155,8 @@ test_expect_success \
git-read-tree -m -u $treeH $treeM &&
git-ls-files --stage >10.out &&
cmp M.out 10.out &&
- sha1sum -c M.sha1'
+ sum bozbar frotz nitfol >actual10.sum &&
+ cmp M.sum actual10.sum'
test_expect_success \
'11 - dirty path removed.' \
@@ -189,9 +195,12 @@ test_expect_success \
git-ls-files --stage >14.out || exit
diff --unified=0 M.out 14.out >14diff.out
compare_change 14diff.out expected &&
+ sum bozbar frotz >actual14.sum &&
+ grep -v nitfol M.sum > expected14.sum &&
+ cmp expected14.sum actual14.sum &&
+ sum bozbar frotz nitfol >actual14a.sum &&
+ if cmp M.sum actual14a.sum; then false; else :; fi &&
check_cache_at nitfol clean &&
- grep -v nitfol M.sha1 | sha1sum -c &&
- if sha1sum -c M.sha1; then false; else :; fi &&
echo nitfol nitfol >nitfol1 &&
diff nitfol nitfol1 &&
rm -f nitfol1'
@@ -207,8 +216,11 @@ test_expect_success \
diff --unified=0 M.out 15.out >15diff.out
compare_change 15diff.out expected &&
check_cache_at nitfol dirty &&
- grep -v nitfol M.sha1 | sha1sum -c &&
- if sha1sum -c M.sha1; then false; else :; fi &&
+ sum bozbar frotz >actual15.sum &&
+ grep -v nitfol M.sum > expected15.sum &&
+ cmp expected15.sum actual15.sum &&
+ sum bozbar frotz nitfol >actual15a.sum &&
+ if cmp M.sum actual15a.sum; then false; else :; fi &&
echo nitfol nitfol nitfol >nitfol1 &&
diff nitfol nitfol1 &&
rm -f nitfol1'
@@ -237,7 +249,8 @@ test_expect_success \
git-ls-files --stage >18.out &&
diff --unified=0 M.out 18.out &&
check_cache_at bozbar clean &&
- sha1sum -c M.sha1'
+ sum bozbar frotz nitfol >actual18.sum &&
+ cmp M.sum actual18.sum'
test_expect_success \
'19 - local change already having a good result, further modified.' \
@@ -249,8 +262,11 @@ test_expect_success \
git-ls-files --stage >19.out &&
diff --unified=0 M.out 19.out &&
check_cache_at bozbar dirty &&
- grep -v bozbar M.sha1 | sha1sum -c &&
- if sha1sum -c M.sha1; then false; else :; fi &&
+ sum frotz nitfol >actual19.sum &&
+ grep -v bozbar M.sum > expected19.sum &&
+ cmp expected19.sum actual19.sum &&
+ sum bozbar frotz nitfol >actual19a.sum &&
+ if cmp M.sum actual19a.sum; then false; else :; fi &&
echo gnusto gnusto >bozbar1 &&
diff bozbar bozbar1 &&
rm -f bozbar1'
@@ -264,7 +280,8 @@ test_expect_success \
git-ls-files --stage >20.out &&
diff --unified=0 M.out 20.out &&
check_cache_at bozbar clean &&
- sha1sum -c M.sha1'
+ sum bozbar frotz nitfol >actual20.sum &&
+ cmp M.sum actual20.sum'
test_expect_success \
'21 - no local change, dirty cache.' \