Skip to content

Commit

Permalink
Fix typo: existant->existent
Browse files Browse the repository at this point in the history
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 <divanorama@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Dmitry Ivankov authored and Junio C Hamano committed Jun 16, 2011
1 parent 302bd99 commit 7be8b3b
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion t/t3903-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
2 changes: 1 addition & 1 deletion t/t4203-mailmap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
2 changes: 1 addition & 1 deletion t/t4205-log-pretty-formats.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
Expand Down
6 changes: 3 additions & 3 deletions t/t5506-remote-groups.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
Expand Down
10 changes: 5 additions & 5 deletions t/t5516-fetch-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand All @@ -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
Expand Down Expand Up @@ -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 &&
Expand Down
4 changes: 2 additions & 2 deletions t/t9300-fast-import.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down

0 comments on commit 7be8b3b

Please sign in to comment.