Skip to content

Commit 7be8b3b

Browse files
divanoramagitster
authored andcommitted
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: Dmitry Ivankov <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 302bd99 commit 7be8b3b

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

refs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1451,7 +1451,7 @@ int write_ref_sha1(struct ref_lock *lock,
14511451
}
14521452
o = parse_object(sha1);
14531453
if (!o) {
1454-
error("Trying to write ref %s with nonexistant object %s",
1454+
error("Trying to write ref %s with nonexistent object %s",
14551455
lock->ref_name, sha1_to_hex(sha1));
14561456
unlock_ref(lock);
14571457
return -1;

t/t3903-stash.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ test_expect_success 'stash pop - fail early if specified stash is not a stash re
536536
git reset --hard HEAD
537537
'
538538

539-
test_expect_success 'ref with non-existant reflog' '
539+
test_expect_success 'ref with non-existent reflog' '
540540
git stash clear &&
541541
echo bar5 > file &&
542542
echo bar6 > file2 &&

t/t4203-mailmap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ nick1 (1):
9494
9595
EOF
9696

97-
test_expect_success 'mailmap.file non-existant' '
97+
test_expect_success 'mailmap.file non-existent' '
9898
rm internal_mailmap/.mailmap &&
9999
rmdir internal_mailmap &&
100100
git shortlog HEAD >actual &&

t/t4205-log-pretty-formats.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ test_expect_success 'alias user-defined tformat' '
4545
test_cmp expected actual
4646
'
4747

48-
test_expect_success 'alias non-existant format' '
48+
test_expect_success 'alias non-existent format' '
4949
git config pretty.test-alias format-that-will-never-exist &&
5050
test_must_fail git log --pretty=test-alias
5151
'

t/t5506-remote-groups.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ test_expect_success 'no group updates all' '
4343
repo_fetched two
4444
'
4545

46-
test_expect_success 'nonexistant group produces error' '
47-
mark nonexistant &&
46+
test_expect_success 'nonexistent group produces error' '
47+
mark nonexistent &&
4848
update_repos &&
49-
test_must_fail git remote update nonexistant &&
49+
test_must_fail git remote update nonexistent &&
5050
! repo_fetched one &&
5151
! repo_fetched two
5252
'

t/t5516-fetch-push.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,15 +367,15 @@ test_expect_success 'push with colon-less refspec (4)' '
367367
368368
'
369369

370-
test_expect_success 'push head with non-existant, incomplete dest' '
370+
test_expect_success 'push head with non-existent, incomplete dest' '
371371
372372
mk_test &&
373373
git push testrepo master:branch &&
374374
check_push_result $the_commit heads/branch
375375
376376
'
377377

378-
test_expect_success 'push tag with non-existant, incomplete dest' '
378+
test_expect_success 'push tag with non-existent, incomplete dest' '
379379
380380
mk_test &&
381381
git tag -f v1.0 &&
@@ -384,14 +384,14 @@ test_expect_success 'push tag with non-existant, incomplete dest' '
384384
385385
'
386386

387-
test_expect_success 'push sha1 with non-existant, incomplete dest' '
387+
test_expect_success 'push sha1 with non-existent, incomplete dest' '
388388
389389
mk_test &&
390390
test_must_fail git push testrepo `git rev-parse master`:foo
391391
392392
'
393393

394-
test_expect_success 'push ref expression with non-existant, incomplete dest' '
394+
test_expect_success 'push ref expression with non-existent, incomplete dest' '
395395
396396
mk_test &&
397397
test_must_fail git push testrepo master^:branch
@@ -436,7 +436,7 @@ test_expect_success 'push with +HEAD' '
436436
437437
'
438438

439-
test_expect_success 'push HEAD with non-existant, incomplete dest' '
439+
test_expect_success 'push HEAD with non-existent, incomplete dest' '
440440
441441
mk_test &&
442442
git checkout master &&

t/t9300-fast-import.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,7 +1893,7 @@ test_expect_success \
18931893
test_cmp marks.out marks.new'
18941894

18951895
cat >input <<EOF
1896-
feature import-marks=nonexistant.marks
1896+
feature import-marks=nonexistent.marks
18971897
feature export-marks=marks.new
18981898
EOF
18991899

@@ -1904,7 +1904,7 @@ test_expect_success \
19041904

19051905

19061906
cat >input <<EOF
1907-
feature import-marks=nonexistant.marks
1907+
feature import-marks=nonexistent.marks
19081908
feature export-marks=combined.marks
19091909
EOF
19101910

0 commit comments

Comments
 (0)