summaryrefslogtreecommitdiff
path: root/t/t1002-read-tree-m-u-2way.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-03 05:52:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-03 05:52:14 (GMT)
commit5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 (patch)
tree9f68d81a31f8dfe7af6096e7beac2dc0997c143a /t/t1002-read-tree-m-u-2way.sh
parent36e5e70e0f40cf7ca4351b8159d68f8560a2805f (diff)
downloadgit-5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3.zip
git-5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3.tar.gz
git-5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3.tar.bz2
Rewrite "git-frotz" to "git frotz"
This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1002-read-tree-m-u-2way.sh')
-rwxr-xr-xt/t1002-read-tree-m-u-2way.sh174
1 files changed, 87 insertions, 87 deletions
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index 87fe993..42e5cf8 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -20,7 +20,7 @@ compare_change () {
}
check_cache_at () {
- clean_if_empty=`git-diff-files -- "$1"`
+ clean_if_empty=`git diff-files -- "$1"`
case "$clean_if_empty" in
'') echo "$1: clean" ;;
?*) echo "$1: dirty" ;;
@@ -39,26 +39,26 @@ test_expect_success \
echo nitfol >nitfol &&
echo bozbar >bozbar &&
echo rezrov >rezrov &&
- git-update-index --add nitfol bozbar rezrov &&
- treeH=`git-write-tree` &&
+ git update-index --add nitfol bozbar rezrov &&
+ treeH=`git write-tree` &&
echo treeH $treeH &&
- git-ls-tree $treeH &&
+ git ls-tree $treeH &&
echo gnusto >bozbar &&
- git-update-index --add frotz bozbar --force-remove rezrov &&
- git-ls-files --stage >M.out &&
- treeM=`git-write-tree` &&
+ git update-index --add frotz bozbar --force-remove rezrov &&
+ git ls-files --stage >M.out &&
+ treeM=`git write-tree` &&
echo treeM $treeM &&
- git-ls-tree $treeM &&
+ git ls-tree $treeM &&
sum bozbar frotz nitfol >M.sum &&
- git-diff-tree $treeH $treeM'
+ git diff-tree $treeH $treeM'
test_expect_success \
'1, 2, 3 - no carry forward' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >1-3.out &&
+ git read-tree --reset -u $treeH &&
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >1-3.out &&
cmp M.out 1-3.out &&
sum bozbar frotz nitfol >actual3.sum &&
cmp M.sum actual3.sum &&
@@ -69,12 +69,12 @@ test_expect_success \
test_expect_success \
'4 - carry forward local addition.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo "+100644 X 0 yomin" >expected &&
echo yomin >yomin &&
- git-update-index --add yomin &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >4.out || return 1
+ git update-index --add yomin &&
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >4.out || return 1
diff -U0 M.out 4.out >4diff.out
compare_change 4diff.out expected &&
check_cache_at yomin clean &&
@@ -87,13 +87,13 @@ test_expect_success \
test_expect_success \
'5 - carry forward local addition.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
- git-read-tree -m -u $treeH &&
+ git read-tree --reset -u $treeH &&
+ git read-tree -m -u $treeH &&
echo yomin >yomin &&
- git-update-index --add yomin &&
+ git update-index --add yomin &&
echo yomin yomin >yomin &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >5.out || return 1
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >5.out || return 1
diff -U0 M.out 5.out >5diff.out
compare_change 5diff.out expected &&
check_cache_at yomin dirty &&
@@ -107,11 +107,11 @@ test_expect_success \
test_expect_success \
'6 - local addition already has the same.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo frotz >frotz &&
- git-update-index --add frotz &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >6.out &&
+ git update-index --add frotz &&
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >6.out &&
diff -U0 M.out 6.out &&
check_cache_at frotz clean &&
sum bozbar frotz nitfol >actual3.sum &&
@@ -123,12 +123,12 @@ test_expect_success \
test_expect_success \
'7 - local addition already has the same.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo frotz >frotz &&
- git-update-index --add frotz &&
+ git update-index --add frotz &&
echo frotz frotz >frotz &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >7.out &&
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >7.out &&
diff -U0 M.out 7.out &&
check_cache_at frotz dirty &&
sum bozbar frotz nitfol >actual7.sum &&
@@ -141,28 +141,28 @@ test_expect_success \
test_expect_success \
'8 - conflicting addition.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo frotz frotz >frotz &&
- git-update-index --add frotz &&
- if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
+ git update-index --add frotz &&
+ if git read-tree -m -u $treeH $treeM; then false; else :; fi'
test_expect_success \
'9 - conflicting addition.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo frotz frotz >frotz &&
- git-update-index --add frotz &&
+ git update-index --add frotz &&
echo frotz >frotz &&
- if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
+ if git read-tree -m -u $treeH $treeM; then false; else :; fi'
test_expect_success \
'10 - path removed.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo rezrov >rezrov &&
- git-update-index --add rezrov &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >10.out &&
+ git update-index --add rezrov &&
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >10.out &&
cmp M.out 10.out &&
sum bozbar frotz nitfol >actual10.sum &&
cmp M.sum actual10.sum'
@@ -170,28 +170,28 @@ test_expect_success \
test_expect_success \
'11 - dirty path removed.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo rezrov >rezrov &&
- git-update-index --add rezrov &&
+ git update-index --add rezrov &&
echo rezrov rezrov >rezrov &&
- if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
+ if git read-tree -m -u $treeH $treeM; then false; else :; fi'
test_expect_success \
'12 - unmatching local changes being removed.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo rezrov rezrov >rezrov &&
- git-update-index --add rezrov &&
- if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
+ git update-index --add rezrov &&
+ if git read-tree -m -u $treeH $treeM; then false; else :; fi'
test_expect_success \
'13 - unmatching local changes being removed.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo rezrov rezrov >rezrov &&
- git-update-index --add rezrov &&
+ git update-index --add rezrov &&
echo rezrov >rezrov &&
- if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
+ if git read-tree -m -u $treeH $treeM; then false; else :; fi'
cat >expected <<EOF
-100644 X 0 nitfol
@@ -201,11 +201,11 @@ EOF
test_expect_success \
'14 - unchanged in two heads.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo nitfol nitfol >nitfol &&
- git-update-index --add nitfol &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >14.out || return 1
+ git update-index --add nitfol &&
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >14.out || return 1
diff -U0 M.out 14.out >14diff.out
compare_change 14diff.out expected &&
sum bozbar frotz >actual14.sum &&
@@ -221,12 +221,12 @@ test_expect_success \
test_expect_success \
'15 - unchanged in two heads.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo nitfol nitfol >nitfol &&
- git-update-index --add nitfol &&
+ git update-index --add nitfol &&
echo nitfol nitfol nitfol >nitfol &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >15.out || return 1
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >15.out || return 1
diff -U0 M.out 15.out >15diff.out
compare_change 15diff.out expected &&
check_cache_at nitfol dirty &&
@@ -242,28 +242,28 @@ test_expect_success \
test_expect_success \
'16 - conflicting local change.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo bozbar bozbar >bozbar &&
- git-update-index --add bozbar &&
- if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
+ git update-index --add bozbar &&
+ if git read-tree -m -u $treeH $treeM; then false; else :; fi'
test_expect_success \
'17 - conflicting local change.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo bozbar bozbar >bozbar &&
- git-update-index --add bozbar &&
+ git update-index --add bozbar &&
echo bozbar bozbar bozbar >bozbar &&
- if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
+ if git read-tree -m -u $treeH $treeM; then false; else :; fi'
test_expect_success \
'18 - local change already having a good result.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo gnusto >bozbar &&
- git-update-index --add bozbar &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >18.out &&
+ git update-index --add bozbar &&
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >18.out &&
diff -U0 M.out 18.out &&
check_cache_at bozbar clean &&
sum bozbar frotz nitfol >actual18.sum &&
@@ -272,12 +272,12 @@ test_expect_success \
test_expect_success \
'19 - local change already having a good result, further modified.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo gnusto >bozbar &&
- git-update-index --add bozbar &&
+ git update-index --add bozbar &&
echo gnusto gnusto >bozbar &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >19.out &&
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >19.out &&
diff -U0 M.out 19.out &&
check_cache_at bozbar dirty &&
sum frotz nitfol >actual19.sum &&
@@ -292,11 +292,11 @@ test_expect_success \
test_expect_success \
'20 - no local change, use new tree.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo bozbar >bozbar &&
- git-update-index --add bozbar &&
- git-read-tree -m -u $treeH $treeM &&
- git-ls-files --stage >20.out &&
+ git update-index --add bozbar &&
+ git read-tree -m -u $treeH $treeM &&
+ git ls-files --stage >20.out &&
diff -U0 M.out 20.out &&
check_cache_at bozbar clean &&
sum bozbar frotz nitfol >actual20.sum &&
@@ -305,39 +305,39 @@ test_expect_success \
test_expect_success \
'21 - no local change, dirty cache.' \
'rm -f .git/index nitfol bozbar rezrov frotz &&
- git-read-tree --reset -u $treeH &&
+ git read-tree --reset -u $treeH &&
echo bozbar >bozbar &&
- git-update-index --add bozbar &&
+ git update-index --add bozbar &&
echo gnusto gnusto >bozbar &&
- if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
+ if git read-tree -m -u $treeH $treeM; then false; else :; fi'
# Also make sure we did not break DF vs DF/DF case.
test_expect_success \
'DF vs DF/DF case setup.' \
'rm -f .git/index
echo DF >DF &&
- git-update-index --add DF &&
- treeDF=`git-write-tree` &&
+ git update-index --add DF &&
+ treeDF=`git write-tree` &&
echo treeDF $treeDF &&
- git-ls-tree $treeDF &&
+ git ls-tree $treeDF &&
rm -f DF &&
mkdir DF &&
echo DF/DF >DF/DF &&
- git-update-index --add --remove DF DF/DF &&
- treeDFDF=`git-write-tree` &&
+ git update-index --add --remove DF DF/DF &&
+ treeDFDF=`git write-tree` &&
echo treeDFDF $treeDFDF &&
- git-ls-tree $treeDFDF &&
- git-ls-files --stage >DFDF.out'
+ git ls-tree $treeDFDF &&
+ git ls-files --stage >DFDF.out'
test_expect_success \
'DF vs DF/DF case test.' \
'rm -f .git/index &&
rm -fr DF &&
echo DF >DF &&
- git-update-index --add DF &&
- git-read-tree -m -u $treeDF $treeDFDF &&
- git-ls-files --stage >DFDFcheck.out &&
+ git update-index --add DF &&
+ git read-tree -m -u $treeDF $treeDFDF &&
+ git ls-files --stage >DFDFcheck.out &&
diff -U0 DFDF.out DFDFcheck.out &&
check_cache_at DF/DF clean'