Merge branch 'di/no-no-existant'
* di/no-no-existant: Fix typo: existant->existentmaint
commit
28eb1afec9
2
refs.c
2
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;
|
||||
|
|
|
@ -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 &&
|
||||
|
|
|
@ -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 &&
|
||||
|
|
|
@ -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
|
||||
'
|
||||
|
|
|
@ -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
|
||||
'
|
||||
|
|
|
@ -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 &&
|
||||
git push testrepo master:branch &&
|
||||
|
@ -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 &&
|
||||
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 &&
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue