projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show-branch: --list and --independent
[git.git]
/
t
/
t1005-read-tree-m-2way-emu23.sh
diff --git
a/t/t1005-read-tree-m-2way-emu23.sh
b/t/t1005-read-tree-m-2way-emu23.sh
index
d80752d
..
258a372
100755
(executable)
--- a/
t/t1005-read-tree-m-2way-emu23.sh
+++ b/
t/t1005-read-tree-m-2way-emu23.sh
@@
-25,7
+25,7
@@
In the test, these paths are used:
read_tree_twoway () {
git-read-tree --emu23 "$1" "$2" &&
git-ls-files --stage &&
read_tree_twoway () {
git-read-tree --emu23 "$1" "$2" &&
git-ls-files --stage &&
- git-merge-
cache git-merge-one-file-script
-a &&
+ git-merge-
index git-merge-one-file
-a &&
git-ls-files --stage
}
git-ls-files --stage
}
@@
-77,13
+77,13
@@
test_expect_success \
cat bozbar-old >bozbar &&
echo rezrov >rezrov &&
echo yomin >yomin &&
cat bozbar-old >bozbar &&
echo rezrov >rezrov &&
echo yomin >yomin &&
- git-update-
cache
--add nitfol bozbar rezrov &&
+ git-update-
index
--add nitfol bozbar rezrov &&
treeH=`git-write-tree` &&
echo treeH $treeH &&
git-ls-tree $treeH &&
cat bozbar-new >bozbar &&
treeH=`git-write-tree` &&
echo treeH $treeH &&
git-ls-tree $treeH &&
cat bozbar-new >bozbar &&
- git-update-
cache
--add frotz bozbar --force-remove rezrov &&
+ git-update-
index
--add frotz bozbar --force-remove rezrov &&
git-ls-files --stage >M.out &&
treeM=`git-write-tree` &&
echo treeM $treeM &&
git-ls-files --stage >M.out &&
treeM=`git-write-tree` &&
echo treeM $treeM &&
@@
-117,10
+117,10
@@
test_expect_success \
'4 - carry forward local addition.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'4 - carry forward local addition.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
- git-update-
cache
--add yomin &&
+ git-checkout-
index
-u -f -q -a &&
+ git-update-
index
--add yomin &&
read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM &&
- git-ls-files --stage >4.out ||
exit
+ git-ls-files --stage >4.out ||
return 1
diff -u M.out 4.out >4diff.out
compare_change 4diff.out expected &&
check_cache_at yomin clean'
diff -u M.out 4.out >4diff.out
compare_change 4diff.out expected &&
check_cache_at yomin clean'
@@
-131,12
+131,12
@@
test_expect_success \
'5 - carry forward local addition.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'5 - carry forward local addition.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo yomin >yomin &&
echo yomin >yomin &&
- git-update-
cache
--add yomin &&
+ git-update-
index
--add yomin &&
echo yomin yomin >yomin &&
read_tree_twoway $treeH $treeM &&
echo yomin yomin >yomin &&
read_tree_twoway $treeH $treeM &&
- git-ls-files --stage >5.out ||
exit
+ git-ls-files --stage >5.out ||
return 1
diff -u M.out 5.out >5diff.out
compare_change 5diff.out expected &&
check_cache_at yomin dirty'
diff -u M.out 5.out >5diff.out
compare_change 5diff.out expected &&
check_cache_at yomin dirty'
@@
-147,8
+147,8
@@
test_expect_success \
'6 - local addition already has the same.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'6 - local addition already has the same.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
- git-update-
cache
--add frotz &&
+ git-checkout-
index
-u -f -q -a &&
+ git-update-
index
--add frotz &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >6.out &&
diff -u M.out 6.out &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >6.out &&
diff -u M.out 6.out &&
@@
-160,9
+160,9
@@
test_expect_success \
'7 - local addition already has the same.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'7 - local addition already has the same.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo frotz >frotz &&
echo frotz >frotz &&
- git-update-
cache
--add frotz &&
+ git-update-
index
--add frotz &&
echo frotz frotz >frotz &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >7.out &&
echo frotz frotz >frotz &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >7.out &&
@@
-173,18
+173,18
@@
test_expect_success \
'8 - conflicting addition.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'8 - conflicting addition.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo frotz frotz >frotz &&
echo frotz frotz >frotz &&
- git-update-
cache
--add frotz &&
+ git-update-
index
--add frotz &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
test_expect_success \
'9 - conflicting addition.' \
'rm -f .git/index &&
git-read-tree $treeH &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
test_expect_success \
'9 - conflicting addition.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo frotz frotz >frotz &&
echo frotz frotz >frotz &&
- git-update-
cache
--add frotz &&
+ git-update-
index
--add frotz &&
echo frotz >frotz &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
echo frotz >frotz &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
@@
-192,9
+192,9
@@
test_expect_success \
'10 - path removed.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'10 - path removed.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo rezrov >rezrov &&
echo rezrov >rezrov &&
- git-update-
cache
--add rezrov &&
+ git-update-
index
--add rezrov &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >10.out &&
diff -u M.out 10.out'
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >10.out &&
diff -u M.out 10.out'
@@
-203,9
+203,9
@@
test_expect_success \
'11 - dirty path removed.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'11 - dirty path removed.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo rezrov >rezrov &&
echo rezrov >rezrov &&
- git-update-
cache
--add rezrov &&
+ git-update-
index
--add rezrov &&
echo rezrov rezrov >rezrov &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
echo rezrov rezrov >rezrov &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
@@
-213,18
+213,18
@@
test_expect_success \
'12 - unmatching local changes being removed.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'12 - unmatching local changes being removed.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo rezrov rezrov >rezrov &&
echo rezrov rezrov >rezrov &&
- git-update-
cache
--add rezrov &&
+ git-update-
index
--add rezrov &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
test_expect_success \
'13 - unmatching local changes being removed.' \
'rm -f .git/index &&
git-read-tree $treeH &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
test_expect_success \
'13 - unmatching local changes being removed.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo rezrov rezrov >rezrov &&
echo rezrov rezrov >rezrov &&
- git-update-
cache
--add rezrov &&
+ git-update-
index
--add rezrov &&
echo rezrov >rezrov &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
echo rezrov >rezrov &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
@@
-237,11
+237,11
@@
test_expect_success \
'14 - unchanged in two heads.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'14 - unchanged in two heads.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo nitfol nitfol >nitfol &&
echo nitfol nitfol >nitfol &&
- git-update-
cache
--add nitfol &&
+ git-update-
index
--add nitfol &&
read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM &&
- git-ls-files --stage >14.out ||
exit
+ git-ls-files --stage >14.out ||
return 1
diff -u M.out 14.out >14diff.out
compare_change 14diff.out expected &&
check_cache_at nitfol clean'
diff -u M.out 14.out >14diff.out
compare_change 14diff.out expected &&
check_cache_at nitfol clean'
@@
-250,12
+250,12
@@
test_expect_success \
'15 - unchanged in two heads.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'15 - unchanged in two heads.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo nitfol nitfol >nitfol &&
echo nitfol nitfol >nitfol &&
- git-update-
cache
--add nitfol &&
+ git-update-
index
--add nitfol &&
echo nitfol nitfol nitfol >nitfol &&
read_tree_twoway $treeH $treeM &&
echo nitfol nitfol nitfol >nitfol &&
read_tree_twoway $treeH $treeM &&
- git-ls-files --stage >15.out ||
exit
+ git-ls-files --stage >15.out ||
return 1
diff -u M.out 15.out >15diff.out
compare_change 15diff.out expected &&
check_cache_at nitfol dirty'
diff -u M.out 15.out >15diff.out
compare_change 15diff.out expected &&
check_cache_at nitfol dirty'
@@
-268,9
+268,9
@@
test_expect_success \
'16 - conflicting local change.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'16 - conflicting local change.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo bozbar bozbar >bozbar &&
echo bozbar bozbar >bozbar &&
- git-update-
cache
--add bozbar &&
+ git-update-
index
--add bozbar &&
git-read-tree --emu23 $treeH $treeM &&
check_stages' <<\EOF
100644 X 1 bozbar
git-read-tree --emu23 $treeH $treeM &&
check_stages' <<\EOF
100644 X 1 bozbar
@@
-286,9
+286,9
@@
test_expect_success \
'17 - conflicting local change.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'17 - conflicting local change.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
echo bozbar bozbar >bozbar &&
echo bozbar bozbar >bozbar &&
- git-update-
cache
--add bozbar &&
+ git-update-
index
--add bozbar &&
echo bozbar bozbar bozbar >bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
echo bozbar bozbar bozbar >bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
@@
-296,9
+296,9
@@
test_expect_success \
'18 - local change already having a good result.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'18 - local change already having a good result.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
cat bozbar-new >bozbar &&
cat bozbar-new >bozbar &&
- git-update-
cache
--add bozbar &&
+ git-update-
index
--add bozbar &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >18.out &&
diff -u M.out 18.out &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >18.out &&
diff -u M.out 18.out &&
@@
-308,9
+308,9
@@
test_expect_success \
'19 - local change already having a good result, further modified.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'19 - local change already having a good result, further modified.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
cat bozbar-new >bozbar &&
cat bozbar-new >bozbar &&
- git-update-
cache
--add bozbar &&
+ git-update-
index
--add bozbar &&
echo gnusto gnusto >bozbar &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >19.out &&
echo gnusto gnusto >bozbar &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >19.out &&
@@
-321,9
+321,9
@@
test_expect_success \
'20 - no local change, use new tree.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'20 - no local change, use new tree.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
cat bozbar-old >bozbar &&
cat bozbar-old >bozbar &&
- git-update-
cache
--add bozbar &&
+ git-update-
index
--add bozbar &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >20.out &&
diff -u M.out 20.out &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >20.out &&
diff -u M.out 20.out &&
@@
-333,9
+333,9
@@
test_expect_success \
'21 - no local change, dirty cache.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'21 - no local change, dirty cache.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
cat bozbar-old >bozbar &&
cat bozbar-old >bozbar &&
- git-update-
cache
--add bozbar &&
+ git-update-
index
--add bozbar &&
echo gnusto gnusto >bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
echo gnusto gnusto >bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
@@
-348,11
+348,11
@@
test_expect_success \
'22 - local change cache updated.' \
'rm -f .git/index &&
git-read-tree $treeH &&
'22 - local change cache updated.' \
'rm -f .git/index &&
git-read-tree $treeH &&
- git-checkout-
cache
-u -f -q -a &&
+ git-checkout-
index
-u -f -q -a &&
sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
- git-update-
cache
--add bozbar &&
+ git-update-
index
--add bozbar &&
read_tree_twoway $treeH $treeM &&
read_tree_twoway $treeH $treeM &&
- git-ls-files --stage >22.out ||
exit
+ git-ls-files --stage >22.out ||
return 1
diff -u M.out 22.out >22diff.out
compare_change 22diff.out &&
check_cache_at bozbar clean'
diff -u M.out 22.out >22diff.out
compare_change 22diff.out &&
check_cache_at bozbar clean'
@@
-362,7
+362,7
@@
test_expect_success \
'DF vs DF/DF case setup.' \
'rm -f .git/index &&
echo DF >DF &&
'DF vs DF/DF case setup.' \
'rm -f .git/index &&
echo DF >DF &&
- git-update-
cache
--add DF &&
+ git-update-
index
--add DF &&
treeDF=`git-write-tree` &&
echo treeDF $treeDF &&
git-ls-tree $treeDF &&
treeDF=`git-write-tree` &&
echo treeDF $treeDF &&
git-ls-tree $treeDF &&
@@
-371,7
+371,7
@@
test_expect_success \
rm -f DF &&
mkdir DF &&
echo DF/DF >DF/DF &&
rm -f DF &&
mkdir DF &&
echo DF/DF >DF/DF &&
- git-update-
cache
--add --remove DF DF/DF &&
+ git-update-
index
--add --remove DF DF/DF &&
treeDFDF=`git-write-tree` &&
echo treeDFDF $treeDFDF &&
git-ls-tree $treeDFDF &&
treeDFDF=`git-write-tree` &&
echo treeDFDF $treeDFDF &&
git-ls-tree $treeDFDF &&
@@
-382,7
+382,7
@@
test_expect_success \
'rm -f .git/index &&
rm -fr DF &&
echo DF >DF &&
'rm -f .git/index &&
rm -fr DF &&
echo DF >DF &&
- git-update-
cache
--add DF &&
+ git-update-
index
--add DF &&
read_tree_twoway $treeDF $treeDFDF &&
git-ls-files --stage >DFDFcheck.out &&
diff -u DFDF.out DFDFcheck.out &&
read_tree_twoway $treeDF $treeDFDF &&
git-ls-files --stage >DFDFcheck.out &&
diff -u DFDF.out DFDFcheck.out &&
@@
-396,7
+396,7
@@
test_expect_success \
rm -fr DF &&
mkdir DF &&
echo DF/DF >DF/DF &&
rm -fr DF &&
mkdir DF &&
echo DF/DF >DF/DF &&
- git-update-
cache
--add DF/DF &&
+ git-update-
index
--add DF/DF &&
read_tree_twoway $treeDFDF $treeDF &&
git-ls-files --stage >DFDFcheck.out &&
diff -u DF.out DFDFcheck.out &&
read_tree_twoway $treeDFDF $treeDF &&
git-ls-files --stage >DFDFcheck.out &&
diff -u DF.out DFDFcheck.out &&
@@
-411,7
+411,7
@@
test_expect_success \
rm -fr DF &&
mkdir DF &&
echo DF/DF >DF/DF &&
rm -fr DF &&
mkdir DF &&
echo DF/DF >DF/DF &&
- git-update-
cache
--add DF/DF &&
+ git-update-
index
--add DF/DF &&
# This should fail because I and H have a conflict
# at DF.
if git-read-tree --emu23 $treeDF $treeDFDF
# This should fail because I and H have a conflict
# at DF.
if git-read-tree --emu23 $treeDF $treeDFDF