Fix typo: existant->existent

divanorama · gitster · commit 7be8b3baba86 · 2011-06-16T10:33:50.000-07:00
refs.c had a error message "Trying to write ref with nonexistant object".
And no tests relied on the wrong spelling.
Also typo was present in some test scripts internals, these tests still pass.

Signed-off-by: Dmitry Ivankov &lt;divanorama@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/refs.c b/refs.c
@@ -1451,7 +1451,7 @@ int write_ref_sha1(struct ref_lock *lock,
 	}
 	o = parse_object(sha1);
 	if (!o) {
-		error("Trying to write ref %s with nonexistant object %s",
+		error("Trying to write ref %s with nonexistent object %s",
 			lock->ref_name, sha1_to_hex(sha1));
 		unlock_ref(lock);
 		return -1;
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
@@ -536,7 +536,7 @@ test_expect_success 'stash pop - fail early if specified stash is not a stash re
 	git reset --hard HEAD
 '
 
-test_expect_success 'ref with non-existant reflog' '
+test_expect_success 'ref with non-existent reflog' '
 	git stash clear &&
 	echo bar5 > file &&
 	echo bar6 > file2 &&
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
@@ -94,7 +94,7 @@ nick1 (1):
 
 EOF
 
-test_expect_success 'mailmap.file non-existant' '
+test_expect_success 'mailmap.file non-existent' '
 	rm internal_mailmap/.mailmap &&
 	rmdir internal_mailmap &&
 	git shortlog HEAD >actual &&
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
@@ -45,7 +45,7 @@ test_expect_success 'alias user-defined tformat' '
 	test_cmp expected actual
 '
 
-test_expect_success 'alias non-existant format' '
+test_expect_success 'alias non-existent format' '
 	git config pretty.test-alias format-that-will-never-exist &&
 	test_must_fail git log --pretty=test-alias
 '
diff --git a/t/t5506-remote-groups.sh b/t/t5506-remote-groups.sh
@@ -43,10 +43,10 @@ test_expect_success 'no group updates all' '
 	repo_fetched two
 '
 
-test_expect_success 'nonexistant group produces error' '
-	mark nonexistant &&
+test_expect_success 'nonexistent group produces error' '
+	mark nonexistent &&
 	update_repos &&
-	test_must_fail git remote update nonexistant &&
+	test_must_fail git remote update nonexistent &&
 	! repo_fetched one &&
 	! repo_fetched two
 '
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
@@ -367,15 +367,15 @@ test_expect_success 'push with colon-less refspec (4)' '
 
 '
 
-test_expect_success 'push head with non-existant, incomplete dest' '
+test_expect_success 'push head with non-existent, incomplete dest' '
 
 	mk_test &&
 	git push testrepo master:branch &&
 	check_push_result $the_commit heads/branch
 
 '
 
-test_expect_success 'push tag with non-existant, incomplete dest' '
+test_expect_success 'push tag with non-existent, incomplete dest' '
 
 	mk_test &&
 	git tag -f v1.0 &&
@@ -384,14 +384,14 @@ test_expect_success 'push tag with non-existant, incomplete dest' '
 
 '
 
-test_expect_success 'push sha1 with non-existant, incomplete dest' '
+test_expect_success 'push sha1 with non-existent, incomplete dest' '
 
 	mk_test &&
 	test_must_fail git push testrepo `git rev-parse master`:foo
 
 '
 
-test_expect_success 'push ref expression with non-existant, incomplete dest' '
+test_expect_success 'push ref expression with non-existent, incomplete dest' '
 
 	mk_test &&
 	test_must_fail git push testrepo master^:branch
@@ -436,7 +436,7 @@ test_expect_success 'push with +HEAD' '
 
 '
 
-test_expect_success 'push HEAD with non-existant, incomplete dest' '
+test_expect_success 'push HEAD with non-existent, incomplete dest' '
 
 	mk_test &&
 	git checkout master &&
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
@@ -1893,7 +1893,7 @@ test_expect_success \
     test_cmp marks.out marks.new'
 
 cat >input <<EOF
-feature import-marks=nonexistant.marks
+feature import-marks=nonexistent.marks
 feature export-marks=marks.new
 EOF
 
@@ -1904,7 +1904,7 @@ test_expect_success \
 
 
 cat >input <<EOF
-feature import-marks=nonexistant.marks
+feature import-marks=nonexistent.marks
 feature export-marks=combined.marks
 EOF
 

Original file line number	Diff line number	Diff line change
`@@ -1451,7 +1451,7 @@ int write_ref_sha1(struct ref_lock *lock,`
`1451`	`1451`	`}`
`1452`	`1452`	`o = parse_object(sha1);`
`1453`	`1453`	`if (!o) {`
`1454`		`- error("Trying to write ref %s with nonexistant object %s",`
	`1454`	`+ error("Trying to write ref %s with nonexistent object %s",`
`1455`	`1455`	`lock->ref_name, sha1_to_hex(sha1));`
`1456`	`1456`	`unlock_ref(lock);`
`1457`	`1457`	`return -1;`
Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,7 @@ test_expect_success 'stash pop - fail early if specified stash is not a stash re`
`536`	`536`	`git reset --hard HEAD`
`537`	`537`	`'`
`538`	`538`
`539`		`-test_expect_success 'ref with non-existant reflog' '`
	`539`	`+test_expect_success 'ref with non-existent reflog' '`
`540`	`540`	`git stash clear &&`
`541`	`541`	`echo bar5 > file &&`
`542`	`542`	`echo bar6 > file2 &&`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ test_expect_success 'alias user-defined tformat' '`
`45`	`45`	`test_cmp expected actual`
`46`	`46`	`'`
`47`	`47`
`48`		`-test_expect_success 'alias non-existant format' '`
	`48`	`+test_expect_success 'alias non-existent format' '`
`49`	`49`	`git config pretty.test-alias format-that-will-never-exist &&`
`50`	`50`	`test_must_fail git log --pretty=test-alias`
`51`	`51`	`'`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,10 @@ test_expect_success 'no group updates all' '`
`43`	`43`	`repo_fetched two`
`44`	`44`	`'`
`45`	`45`
`46`		`-test_expect_success 'nonexistant group produces error' '`
`47`		`- mark nonexistant &&`
	`46`	`+test_expect_success 'nonexistent group produces error' '`
	`47`	`+ mark nonexistent &&`
`48`	`48`	`update_repos &&`
`49`		`- test_must_fail git remote update nonexistant &&`
	`49`	`+ test_must_fail git remote update nonexistent &&`
`50`	`50`	`! repo_fetched one &&`
`51`	`51`	`! repo_fetched two`
`52`	`52`	`'`
Original file line number	Diff line number	Diff line change
`@@ -367,15 +367,15 @@ test_expect_success 'push with colon-less refspec (4)' '`
`367`	`367`
`368`	`368`	`'`
`369`	`369`
`370`		`-test_expect_success 'push head with non-existant, incomplete dest' '`
	`370`	`+test_expect_success 'push head with non-existent, incomplete dest' '`
`371`	`371`
`372`	`372`	`mk_test &&`
`373`	`373`	`git push testrepo master:branch &&`
`374`	`374`	`check_push_result $the_commit heads/branch`
`375`	`375`
`376`	`376`	`'`
`377`	`377`
`378`		`-test_expect_success 'push tag with non-existant, incomplete dest' '`
	`378`	`+test_expect_success 'push tag with non-existent, incomplete dest' '`
`379`	`379`
`380`	`380`	`mk_test &&`
`381`	`381`	`git tag -f v1.0 &&`
`@@ -384,14 +384,14 @@ test_expect_success 'push tag with non-existant, incomplete dest' '`
`384`	`384`
`385`	`385`	`'`
`386`	`386`
`387`		`-test_expect_success 'push sha1 with non-existant, incomplete dest' '`
	`387`	`+test_expect_success 'push sha1 with non-existent, incomplete dest' '`
`388`	`388`
`389`	`389`	`mk_test &&`
`390`	`390`	test_must_fail git push testrepo `git rev-parse master`:foo
`391`	`391`
`392`	`392`	`'`
`393`	`393`
`394`		`-test_expect_success 'push ref expression with non-existant, incomplete dest' '`
	`394`	`+test_expect_success 'push ref expression with non-existent, incomplete dest' '`
`395`	`395`
`396`	`396`	`mk_test &&`
`397`	`397`	`test_must_fail git push testrepo master^:branch`
`@@ -436,7 +436,7 @@ test_expect_success 'push with +HEAD' '`
`436`	`436`
`437`	`437`	`'`
`438`	`438`
`439`		`-test_expect_success 'push HEAD with non-existant, incomplete dest' '`
	`439`	`+test_expect_success 'push HEAD with non-existent, incomplete dest' '`
`440`	`440`
`441`	`441`	`mk_test &&`
`442`	`442`	`git checkout master &&`