X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3700-add.sh;h=a328bf57eb67fd96a88020f02948d380ec699496;hb=55246aac6717e86c14f31391ac903ed810d1a9a0;hp=e6466d74a028100fefe1d709d518c31fead0eb8b;hpb=05dcd69891632101d347b2f8a6bc37a08878aa1a;p=git.git

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index e6466d74a..a328bf57e 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -3,72 +3,72 @@
 # Copyright (c) 2006 Carl D. Worth
 #
 
-test_description='Test of git-add, including the -- option.'
+test_description='Test of git add, including the -- option.'
 
 . ./test-lib.sh
 
 test_expect_success \
-    'Test of git-add' \
-    'touch foo && git-add foo'
+    'Test of git add' \
+    'touch foo && git add foo'
 
 test_expect_success \
     'Post-check that foo is in the index' \
-    'git-ls-files foo | grep foo'
+    'git ls-files foo | grep foo'
 
 test_expect_success \
-    'Test that "git-add -- -q" works' \
-    'touch -- -q && git-add -- -q'
+    'Test that "git add -- -q" works' \
+    'touch -- -q && git add -- -q'
 
 test_expect_success \
-	'git-add: Test that executable bit is not used if core.filemode=0' \
+	'git add: Test that executable bit is not used if core.filemode=0' \
 	'git config core.filemode 0 &&
 	 echo foo >xfoo1 &&
 	 chmod 755 xfoo1 &&
-	 git-add xfoo1 &&
-	 case "`git-ls-files --stage xfoo1`" in
+	 git add xfoo1 &&
+	 case "`git ls-files --stage xfoo1`" in
 	 100644" "*xfoo1) echo ok;;
-	 *) echo fail; git-ls-files --stage xfoo1; (exit 1);;
+	 *) echo fail; git ls-files --stage xfoo1; (exit 1);;
 	 esac'
 
-test_expect_success 'git-add: filemode=0 should not get confused by symlink' '
+test_expect_success 'git add: filemode=0 should not get confused by symlink' '
 	rm -f xfoo1 &&
 	ln -s foo xfoo1 &&
-	git-add xfoo1 &&
-	case "`git-ls-files --stage xfoo1`" in
+	git add xfoo1 &&
+	case "`git ls-files --stage xfoo1`" in
 	120000" "*xfoo1) echo ok;;
-	*) echo fail; git-ls-files --stage xfoo1; (exit 1);;
+	*) echo fail; git ls-files --stage xfoo1; (exit 1);;
 	esac
 '
 
 test_expect_success \
-	'git-update-index --add: Test that executable bit is not used...' \
+	'git update-index --add: Test that executable bit is not used...' \
 	'git config core.filemode 0 &&
 	 echo foo >xfoo2 &&
 	 chmod 755 xfoo2 &&
-	 git-update-index --add xfoo2 &&
-	 case "`git-ls-files --stage xfoo2`" in
+	 git update-index --add xfoo2 &&
+	 case "`git ls-files --stage xfoo2`" in
 	 100644" "*xfoo2) echo ok;;
-	 *) echo fail; git-ls-files --stage xfoo2; (exit 1);;
+	 *) echo fail; git ls-files --stage xfoo2; (exit 1);;
 	 esac'
 
-test_expect_success 'git-add: filemode=0 should not get confused by symlink' '
+test_expect_success 'git add: filemode=0 should not get confused by symlink' '
 	rm -f xfoo2 &&
 	ln -s foo xfoo2 &&
 	git update-index --add xfoo2 &&
-	case "`git-ls-files --stage xfoo2`" in
+	case "`git ls-files --stage xfoo2`" in
 	120000" "*xfoo2) echo ok;;
-	*) echo fail; git-ls-files --stage xfoo2; (exit 1);;
+	*) echo fail; git ls-files --stage xfoo2; (exit 1);;
 	esac
 '
 
 test_expect_success \
-	'git-update-index --add: Test that executable bit is not used...' \
+	'git update-index --add: Test that executable bit is not used...' \
 	'git config core.filemode 0 &&
 	 ln -s xfoo2 xfoo3 &&
-	 git-update-index --add xfoo3 &&
-	 case "`git-ls-files --stage xfoo3`" in
+	 git update-index --add xfoo3 &&
+	 case "`git ls-files --stage xfoo3`" in
 	 120000" "*xfoo3) echo ok;;
-	 *) echo fail; git-ls-files --stage xfoo3; (exit 1);;
+	 *) echo fail; git ls-files --stage xfoo3; (exit 1);;
 	 esac'
 
 test_expect_success '.gitignore test setup' '
@@ -80,28 +80,28 @@ test_expect_success '.gitignore test setup' '
 '
 
 test_expect_success '.gitignore is honored' '
-	git-add . &&
-	! git-ls-files | grep "\\.ig"
+	git add . &&
+	! git ls-files | grep "\\.ig"
 '
 
 test_expect_success 'error out when attempting to add ignored ones without -f' '
-	! git-add a.?? &&
-	! git-ls-files | grep "\\.ig"
+	! git add a.?? &&
+	! git ls-files | grep "\\.ig"
 '
 
 test_expect_success 'error out when attempting to add ignored ones without -f' '
-	! git-add d.?? &&
-	! git-ls-files | grep "\\.ig"
+	! git add d.?? &&
+	! git ls-files | grep "\\.ig"
 '
 
 test_expect_success 'add ignored ones with -f' '
-	git-add -f a.?? &&
-	git-ls-files --error-unmatch a.ig
+	git add -f a.?? &&
+	git ls-files --error-unmatch a.ig
 '
 
 test_expect_success 'add ignored ones with -f' '
-	git-add -f d.??/* &&
-	git-ls-files --error-unmatch d.ig/d.if d.ig/d.ig
+	git add -f d.??/* &&
+	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
 '
 
 mkdir 1 1/2 1/3
@@ -131,8 +131,8 @@ test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over st
 	(
 		echo "100644 $(git hash-object -w stage1) 1	file"
 		echo "100755 $(git hash-object -w stage2) 2	file"
-		echo "100644 $(printf $s | git hash-object -w -t blob --stdin) 1	symlink"
-		echo "120000 $(printf $s | git hash-object -w -t blob --stdin) 2	symlink"
+		echo "100644 $(printf 1 | git hash-object -w -t blob --stdin) 1	symlink"
+		echo "120000 $(printf 2 | git hash-object -w -t blob --stdin) 2	symlink"
 	) | git update-index --index-info &&
 	git config core.filemode 0 &&
 	git config core.symlinks 0 &&
@@ -143,4 +143,16 @@ test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over st
 	git ls-files --stage | grep "^120000 .* 0	symlink$"
 '
 
+test_expect_success 'git add --refresh' '
+	>foo && git add foo && git commit -a -m "commit all" &&
+	test -z "`git diff-index HEAD -- foo`" &&
+	git read-tree HEAD &&
+	case "`git diff-index HEAD -- foo`" in
+	:100644" "*"M	foo") echo ok;;
+	*) echo fail; (exit 1);;
+	esac &&
+	git add --refresh -- foo &&
+	test -z "`git diff-index HEAD -- foo`"
+'
+
 test_done