提交 7be8b3ba 编写于 作者: D Dmitry Ivankov 提交者: Junio C Hamano

Fix typo: existant->existent

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: NDmitry Ivankov <divanorama@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 302bd999
...@@ -1451,7 +1451,7 @@ int write_ref_sha1(struct ref_lock *lock, ...@@ -1451,7 +1451,7 @@ int write_ref_sha1(struct ref_lock *lock,
} }
o = parse_object(sha1); o = parse_object(sha1);
if (!o) { 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)); lock->ref_name, sha1_to_hex(sha1));
unlock_ref(lock); unlock_ref(lock);
return -1; return -1;
......
...@@ -536,7 +536,7 @@ test_expect_success 'stash pop - fail early if specified stash is not a stash re ...@@ -536,7 +536,7 @@ test_expect_success 'stash pop - fail early if specified stash is not a stash re
git reset --hard HEAD git reset --hard HEAD
' '
test_expect_success 'ref with non-existant reflog' ' test_expect_success 'ref with non-existent reflog' '
git stash clear && git stash clear &&
echo bar5 > file && echo bar5 > file &&
echo bar6 > file2 && echo bar6 > file2 &&
......
...@@ -94,7 +94,7 @@ nick1 (1): ...@@ -94,7 +94,7 @@ nick1 (1):
EOF EOF
test_expect_success 'mailmap.file non-existant' ' test_expect_success 'mailmap.file non-existent' '
rm internal_mailmap/.mailmap && rm internal_mailmap/.mailmap &&
rmdir internal_mailmap && rmdir internal_mailmap &&
git shortlog HEAD >actual && git shortlog HEAD >actual &&
......
...@@ -45,7 +45,7 @@ test_expect_success 'alias user-defined tformat' ' ...@@ -45,7 +45,7 @@ test_expect_success 'alias user-defined tformat' '
test_cmp expected actual 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 && git config pretty.test-alias format-that-will-never-exist &&
test_must_fail git log --pretty=test-alias test_must_fail git log --pretty=test-alias
' '
......
...@@ -43,10 +43,10 @@ test_expect_success 'no group updates all' ' ...@@ -43,10 +43,10 @@ test_expect_success 'no group updates all' '
repo_fetched two repo_fetched two
' '
test_expect_success 'nonexistant group produces error' ' test_expect_success 'nonexistent group produces error' '
mark nonexistant && mark nonexistent &&
update_repos && update_repos &&
test_must_fail git remote update nonexistant && test_must_fail git remote update nonexistent &&
! repo_fetched one && ! repo_fetched one &&
! repo_fetched two ! repo_fetched two
' '
......
...@@ -367,7 +367,7 @@ test_expect_success 'push with colon-less refspec (4)' ' ...@@ -367,7 +367,7 @@ 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 && mk_test &&
git push testrepo master:branch && git push testrepo master:branch &&
...@@ -375,7 +375,7 @@ test_expect_success 'push head with non-existant, incomplete dest' ' ...@@ -375,7 +375,7 @@ test_expect_success 'push head with non-existant, incomplete dest' '
' '
test_expect_success 'push tag with non-existant, incomplete dest' ' test_expect_success 'push tag with non-existent, incomplete dest' '
mk_test && mk_test &&
git tag -f v1.0 && git tag -f v1.0 &&
...@@ -384,14 +384,14 @@ test_expect_success 'push tag with non-existant, incomplete dest' ' ...@@ -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 && mk_test &&
test_must_fail git push testrepo `git rev-parse master`:foo 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 && mk_test &&
test_must_fail git push testrepo master^:branch test_must_fail git push testrepo master^:branch
...@@ -436,7 +436,7 @@ test_expect_success 'push with +HEAD' ' ...@@ -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 && mk_test &&
git checkout master && git checkout master &&
......
...@@ -1893,7 +1893,7 @@ test_expect_success \ ...@@ -1893,7 +1893,7 @@ test_expect_success \
test_cmp marks.out marks.new' test_cmp marks.out marks.new'
cat >input <<EOF cat >input <<EOF
feature import-marks=nonexistant.marks feature import-marks=nonexistent.marks
feature export-marks=marks.new feature export-marks=marks.new
EOF EOF
...@@ -1904,7 +1904,7 @@ test_expect_success \ ...@@ -1904,7 +1904,7 @@ test_expect_success \
cat >input <<EOF cat >input <<EOF
feature import-marks=nonexistant.marks feature import-marks=nonexistent.marks
feature export-marks=combined.marks feature export-marks=combined.marks
EOF EOF
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册