development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'hn/allow-bogus-oid-in-ref-tests'

Browse source 
The test helper for refs subsystem learned to write bogus and/or
nonexistent object name to refs to simulate error situations we
want to test Git in.

* hn/allow-bogus-oid-in-ref-tests:
  t1430: create valid symrefs using test-helper
  t1430: remove refs using test-tool
  refs: introduce REF_SKIP_REFNAME_VERIFICATION flag
  refs: introduce REF_SKIP_OID_VERIFICATION flag
  refs: update comment.
  test-ref-store: plug memory leak in cmd_delete_refs
  test-ref-store: parse symbolic flag constants
  test-ref-store: remove force-create argument for create-reflog
This commit is contained in:
Junio C Hamano 2021-12-15 09:39:54 -08:00
parent bc32aa1e63 9912391402
commit b174a3c014
8 changed files with 169 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
refs.c
View file

@ -1083,9 +1083,10 @@ int ref_transaction_update(struct ref_transaction *transaction,
{ {
assert(err); assert(err);
if ((new_oid && !is_null_oid(new_oid)) ? if (!(flags & REF_SKIP_REFNAME_VERIFICATION) &&
check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) : ((new_oid && !is_null_oid(new_oid)) ?
!refname_is_safe(refname)) { check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) :
!refname_is_safe(refname))) {
strbuf_addf(err, _("refusing to update ref with bad name '%s'"), strbuf_addf(err, _("refusing to update ref with bad name '%s'"),
refname); refname);
return -1; return -1;

16
refs.h
View file

@ -637,12 +637,24 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
*/ */
#define REF_FORCE_CREATE_REFLOG (1 << 1) #define REF_FORCE_CREATE_REFLOG (1 << 1)
/*
* Blindly write an object_id. This is useful for testing data corruption
* scenarios.
*/
#define REF_SKIP_OID_VERIFICATION (1 << 10)
/*
* Skip verifying refname. This is useful for testing data corruption scenarios.
*/
#define REF_SKIP_REFNAME_VERIFICATION (1 << 11)
/* /*
* Bitmask of all of the flags that are allowed to be passed in to * Bitmask of all of the flags that are allowed to be passed in to
* ref_transaction_update() and friends: * ref_transaction_update() and friends:
*/ */
#define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS \ #define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS \
(REF_NO_DEREF | REF_FORCE_CREATE_REFLOG) (REF_NO_DEREF | REF_FORCE_CREATE_REFLOG | REF_SKIP_OID_VERIFICATION | \
REF_SKIP_REFNAME_VERIFICATION)
/* /*
* Add a reference update to transaction. `new_oid` is the value that * Add a reference update to transaction. `new_oid` is the value that

53
refs/files-backend.c
View file

@ -16,8 +16,7 @@
* This backend uses the following flags in `ref_update::flags` for * This backend uses the following flags in `ref_update::flags` for
* internal bookkeeping purposes. Their numerical values must not * internal bookkeeping purposes. Their numerical values must not
* conflict with REF_NO_DEREF, REF_FORCE_CREATE_REFLOG, REF_HAVE_NEW, * conflict with REF_NO_DEREF, REF_FORCE_CREATE_REFLOG, REF_HAVE_NEW,
* REF_HAVE_OLD, or REF_IS_PRUNING, which are also stored in * or REF_HAVE_OLD, which are also stored in `ref_update::flags`.
* `ref_update::flags`.
*/ */
/* /*
@ -1354,7 +1353,8 @@ static int rename_tmp_log(struct files_ref_store *refs, const char *newrefname)
} }
static int write_ref_to_lockfile(struct ref_lock *lock, static int write_ref_to_lockfile(struct ref_lock *lock,
const struct object_id *oid, struct strbuf *err); const struct object_id *oid,
int skip_oid_verification, struct strbuf *err);
static int commit_ref_update(struct files_ref_store *refs, static int commit_ref_update(struct files_ref_store *refs,
struct ref_lock *lock, struct ref_lock *lock,
const struct object_id *oid, const char *logmsg, const struct object_id *oid, const char *logmsg,
@ -1501,7 +1501,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
} }
oidcpy(&lock->old_oid, &orig_oid); oidcpy(&lock->old_oid, &orig_oid);
if (write_ref_to_lockfile(lock, &orig_oid, &err) || if (write_ref_to_lockfile(lock, &orig_oid, 0, &err) ||
commit_ref_update(refs, lock, &orig_oid, logmsg, &err)) { commit_ref_update(refs, lock, &orig_oid, logmsg, &err)) {
error("unable to write current sha1 into %s: %s", newrefname, err.buf); error("unable to write current sha1 into %s: %s", newrefname, err.buf);
strbuf_release(&err); strbuf_release(&err);
@ -1521,7 +1521,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
flag = log_all_ref_updates; flag = log_all_ref_updates;
log_all_ref_updates = LOG_REFS_NONE; log_all_ref_updates = LOG_REFS_NONE;
if (write_ref_to_lockfile(lock, &orig_oid, &err) || if (write_ref_to_lockfile(lock, &orig_oid, 0, &err) ||
commit_ref_update(refs, lock, &orig_oid, NULL, &err)) { commit_ref_update(refs, lock, &orig_oid, NULL, &err)) {
error("unable to write current sha1 into %s: %s", oldrefname, err.buf); error("unable to write current sha1 into %s: %s", oldrefname, err.buf);
strbuf_release(&err); strbuf_release(&err);
@ -1756,26 +1756,31 @@ static int files_log_ref_write(struct files_ref_store *refs,
* errors, rollback the lockfile, fill in *err and return -1. * errors, rollback the lockfile, fill in *err and return -1.
*/ */
static int write_ref_to_lockfile(struct ref_lock *lock, static int write_ref_to_lockfile(struct ref_lock *lock,
const struct object_id *oid, struct strbuf *err) const struct object_id *oid,
int skip_oid_verification, struct strbuf *err)
{ {
static char term = '\n'; static char term = '\n';
struct object *o; struct object *o;
int fd; int fd;
o = parse_object(the_repository, oid); if (!skip_oid_verification) {
if (!o) { o = parse_object(the_repository, oid);
strbuf_addf(err, if (!o) {
"trying to write ref '%s' with nonexistent object %s", strbuf_addf(
lock->ref_name, oid_to_hex(oid)); err,
unlock_ref(lock); "trying to write ref '%s' with nonexistent object %s",
return -1; lock->ref_name, oid_to_hex(oid));
} unlock_ref(lock);
if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) { return -1;
strbuf_addf(err, }
"trying to write non-commit object %s to branch '%s'", if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) {
oid_to_hex(oid), lock->ref_name); strbuf_addf(
unlock_ref(lock); err,
return -1; "trying to write non-commit object %s to branch '%s'",
oid_to_hex(oid), lock->ref_name);
unlock_ref(lock);
return -1;
}
} }
fd = get_lock_file_fd(&lock->lk); fd = get_lock_file_fd(&lock->lk);
if (write_in_full(fd, oid_to_hex(oid), the_hash_algo->hexsz) < 0 || if (write_in_full(fd, oid_to_hex(oid), the_hash_algo->hexsz) < 0 ||
@ -2189,7 +2194,7 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
} }
static int files_reflog_iterator_peel(struct ref_iterator *ref_iterator, static int files_reflog_iterator_peel(struct ref_iterator *ref_iterator,
struct object_id *peeled) struct object_id *peeled)
{ {
BUG("ref_iterator_peel() called for reflog_iterator"); BUG("ref_iterator_peel() called for reflog_iterator");
} }
@ -2575,8 +2580,10 @@ static int lock_ref_for_update(struct files_ref_store *refs,
* The reference already has the desired * The reference already has the desired
* value, so we don't need to write it. * value, so we don't need to write it.
*/ */
} else if (write_ref_to_lockfile(lock, &update->new_oid, } else if (write_ref_to_lockfile(
err)) { lock, &update->new_oid,
update->flags & REF_SKIP_OID_VERIFICATION,
err)) {
char *write_err = strbuf_detach(err, NULL); char *write_err = strbuf_detach(err, NULL);
/* /*

73
t/helper/test-ref-store.c
View file

@ -5,6 +5,48 @@
#include "object-store.h" #include "object-store.h"
#include "repository.h" #include "repository.h"
struct flag_definition {
const char *name;
uint64_t mask;
};
#define FLAG_DEF(x) \
{ \
#x, (x) \
}
static unsigned int parse_flags(const char *str, struct flag_definition *defs)
{
struct string_list masks = STRING_LIST_INIT_DUP;
int i = 0;
unsigned int result = 0;
if (!strcmp(str, "0"))
return 0;
string_list_split(&masks, str, ',', 64);
for (; i < masks.nr; i++) {
const char *name = masks.items[i].string;
struct flag_definition *def = defs;
int found = 0;
while (def->name) {
if (!strcmp(def->name, name)) {
result |= def->mask;
found = 1;
break;
}
def++;
}
if (!found)
die("unknown flag \"%s\"", name);
}
string_list_clear(&masks, 0);
return result;
}
static struct flag_definition empty_flags[] = { { NULL, 0 } };
static const char *notnull(const char *arg, const char *name) static const char *notnull(const char *arg, const char *name)
{ {
if (!arg) if (!arg)
@ -12,9 +54,10 @@ static const char *notnull(const char *arg, const char *name)
return arg; return arg;
} }
static unsigned int arg_flags(const char *arg, const char *name) static unsigned int arg_flags(const char *arg, const char *name,
struct flag_definition *defs)
{ {
return atoi(notnull(arg, name)); return parse_flags(notnull(arg, name), defs);
} }
static const char **get_store(const char **argv, struct ref_store **refs) static const char **get_store(const char **argv, struct ref_store **refs)
@ -64,10 +107,13 @@ static const char **get_store(const char **argv, struct ref_store **refs)
return argv + 1; return argv + 1;
} }
static struct flag_definition pack_flags[] = { FLAG_DEF(PACK_REFS_PRUNE),
FLAG_DEF(PACK_REFS_ALL),
{ NULL, 0 } };
static int cmd_pack_refs(struct ref_store *refs, const char **argv) static int cmd_pack_refs(struct ref_store *refs, const char **argv)
{ {
unsigned int flags = arg_flags(*argv++, "flags"); unsigned int flags = arg_flags(*argv++, "flags", pack_flags);
return refs_pack_refs(refs, flags); return refs_pack_refs(refs, flags);
} }
@ -81,16 +127,27 @@ static int cmd_create_symref(struct ref_store *refs, const char **argv)
return refs_create_symref(refs, refname, target, logmsg); return refs_create_symref(refs, refname, target, logmsg);
} }
static struct flag_definition transaction_flags[] = {
FLAG_DEF(REF_NO_DEREF),
FLAG_DEF(REF_FORCE_CREATE_REFLOG),
FLAG_DEF(REF_SKIP_OID_VERIFICATION),
FLAG_DEF(REF_SKIP_REFNAME_VERIFICATION),
{ NULL, 0 }
};
static int cmd_delete_refs(struct ref_store *refs, const char **argv) static int cmd_delete_refs(struct ref_store *refs, const char **argv)
{ {
unsigned int flags = arg_flags(*argv++, "flags"); unsigned int flags = arg_flags(*argv++, "flags", transaction_flags);
const char *msg = *argv++; const char *msg = *argv++;
struct string_list refnames = STRING_LIST_INIT_NODUP; struct string_list refnames = STRING_LIST_INIT_NODUP;
int result;
while (*argv) while (*argv)
string_list_append(&refnames, *argv++); string_list_append(&refnames, *argv++);
return refs_delete_refs(refs, msg, &refnames, flags); result = refs_delete_refs(refs, msg, &refnames, flags);
string_list_clear(&refnames, 0);
return result;
} }
static int cmd_rename_ref(struct ref_store *refs, const char **argv) static int cmd_rename_ref(struct ref_store *refs, const char **argv)
@ -120,7 +177,7 @@ static int cmd_resolve_ref(struct ref_store *refs, const char **argv)
{ {
struct object_id oid = *null_oid(); struct object_id oid = *null_oid();
const char *refname = notnull(*argv++, "refname"); const char *refname = notnull(*argv++, "refname");
int resolve_flags = arg_flags(*argv++, "resolve-flags"); int resolve_flags = arg_flags(*argv++, "resolve-flags", empty_flags);
int flags; int flags;
const char *ref; const char *ref;
int ignore_errno; int ignore_errno;
@ -208,7 +265,7 @@ static int cmd_delete_ref(struct ref_store *refs, const char **argv)
const char *msg = notnull(*argv++, "msg"); const char *msg = notnull(*argv++, "msg");
const char *refname = notnull(*argv++, "refname"); const char *refname = notnull(*argv++, "refname");
const char *sha1_buf = notnull(*argv++, "old-sha1"); const char *sha1_buf = notnull(*argv++, "old-sha1");
unsigned int flags = arg_flags(*argv++, "flags"); unsigned int flags = arg_flags(*argv++, "flags", transaction_flags);
struct object_id old_oid; struct object_id old_oid;
if (get_oid_hex(sha1_buf, &old_oid)) if (get_oid_hex(sha1_buf, &old_oid))
@ -223,7 +280,7 @@ static int cmd_update_ref(struct ref_store *refs, const char **argv)
const char *refname = notnull(*argv++, "refname"); const char *refname = notnull(*argv++, "refname");
const char *new_sha1_buf = notnull(*argv++, "new-sha1"); const char *new_sha1_buf = notnull(*argv++, "new-sha1");
const char *old_sha1_buf = notnull(*argv++, "old-sha1"); const char *old_sha1_buf = notnull(*argv++, "old-sha1");
unsigned int flags = arg_flags(*argv++, "flags"); unsigned int flags = arg_flags(*argv++, "flags", transaction_flags);
struct object_id old_oid; struct object_id old_oid;
struct object_id new_oid; struct object_id new_oid;

5
t/t1006-cat-file.sh
View file

@ -452,9 +452,8 @@ test_expect_success 'the --allow-unknown-type option does not consider replaceme
# Create it manually, as "git replace" will die on bogus # Create it manually, as "git replace" will die on bogus
# types. # types.
head=$(git rev-parse --verify HEAD) && head=$(git rev-parse --verify HEAD) &&
test_when_finished "rm -rf .git/refs/replace" && test_when_finished "test-tool ref-store main delete-refs 0 msg refs/replace/$bogus_short_sha1" &&
mkdir -p .git/refs/replace && test-tool ref-store main update-ref msg "refs/replace/$bogus_short_sha1" $head $ZERO_OID REF_SKIP_OID_VERIFICATION &&
echo $head >.git/refs/replace/$bogus_short_sha1 &&
cat >expect <<-EOF && cat >expect <<-EOF &&
commit commit

6
t/t1405-main-ref-store.sh
View file

@ -17,8 +17,7 @@ test_expect_success 'setup' '
test_expect_success REFFILES 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' ' test_expect_success REFFILES 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
N=`find .git/refs -type f | wc -l` && N=`find .git/refs -type f | wc -l` &&
test "$N" != 0 && test "$N" != 0 &&
ALL_OR_PRUNE_FLAG=3 && $RUN pack-refs PACK_REFS_PRUNE,PACK_REFS_ALL &&
$RUN pack-refs ${ALL_OR_PRUNE_FLAG} &&
N=`find .git/refs -type f` && N=`find .git/refs -type f` &&
test -z "$N" test -z "$N"
' '
@ -35,8 +34,7 @@ test_expect_success 'delete_refs(FOO, refs/tags/new-tag)' '
git rev-parse FOO -- && git rev-parse FOO -- &&
git rev-parse refs/tags/new-tag -- && git rev-parse refs/tags/new-tag -- &&
m=$(git rev-parse main) && m=$(git rev-parse main) &&
REF_NO_DEREF=1 && $RUN delete-refs REF_NO_DEREF nothing FOO refs/tags/new-tag &&
$RUN delete-refs $REF_NO_DEREF nothing FOO refs/tags/new-tag &&
test_must_fail git rev-parse --symbolic-full-name FOO && test_must_fail git rev-parse --symbolic-full-name FOO &&
test_must_fail git rev-parse FOO -- && test_must_fail git rev-parse FOO -- &&
test_must_fail git rev-parse refs/tags/new-tag -- test_must_fail git rev-parse refs/tags/new-tag --

93
t/t1430-bad-ref-name.sh
View file

@ -9,7 +9,8 @@ TEST_PASSES_SANITIZE_LEAK=true
test_expect_success setup ' test_expect_success setup '
test_commit one && test_commit one &&
test_commit two test_commit two &&
main_sha1=$(git rev-parse refs/heads/main)
' '
test_expect_success 'fast-import: fail on invalid branch name ".badbranchname"' ' test_expect_success 'fast-import: fail on invalid branch name ".badbranchname"' '
@ -43,16 +44,16 @@ test_expect_success 'fast-import: fail on invalid branch name "bad[branch]name"'
' '
test_expect_success 'git branch shows badly named ref as warning' ' test_expect_success 'git branch shows badly named ref as warning' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch >output 2>error && git branch >output 2>error &&
test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error && test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
! grep -e "broken\.\.\.ref" output ! grep -e "broken\.\.\.ref" output
' '
test_expect_success 'branch -d can delete badly named ref' ' test_expect_success 'branch -d can delete badly named ref' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch -d broken...ref && git branch -d broken...ref &&
git branch >output 2>error && git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error && ! grep -e "broken\.\.\.ref" error &&
@ -60,8 +61,8 @@ test_expect_success 'branch -d can delete badly named ref' '
' '
test_expect_success 'branch -D can delete badly named ref' ' test_expect_success 'branch -D can delete badly named ref' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch -D broken...ref && git branch -D broken...ref &&
git branch >output 2>error && git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error && ! grep -e "broken\.\.\.ref" error &&
@ -90,7 +91,7 @@ test_expect_success 'branch -D cannot delete absolute path' '
' '
test_expect_success 'git branch cannot create a badly named ref' ' test_expect_success 'git branch cannot create a badly named ref' '
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
test_must_fail git branch broken...ref && test_must_fail git branch broken...ref &&
git branch >output 2>error && git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error && ! grep -e "broken\.\.\.ref" error &&
@ -98,7 +99,7 @@ test_expect_success 'git branch cannot create a badly named ref' '
' '
test_expect_success 'branch -m cannot rename to a bad ref name' ' test_expect_success 'branch -m cannot rename to a bad ref name' '
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
test_might_fail git branch -D goodref && test_might_fail git branch -D goodref &&
git branch goodref && git branch goodref &&
test_must_fail git branch -m goodref broken...ref && test_must_fail git branch -m goodref broken...ref &&
@ -109,8 +110,9 @@ test_expect_success 'branch -m cannot rename to a bad ref name' '
' '
test_expect_failure 'branch -m can rename from a bad ref name' ' test_expect_failure 'branch -m can rename from a bad ref name' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch -m broken...ref renamed && git branch -m broken...ref renamed &&
test_cmp_rev main renamed && test_cmp_rev main renamed &&
git branch >output 2>error && git branch >output 2>error &&
@ -119,7 +121,7 @@ test_expect_failure 'branch -m can rename from a bad ref name' '
' '
test_expect_success 'push cannot create a badly named ref' ' test_expect_success 'push cannot create a badly named ref' '
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
test_must_fail git push "file://$(pwd)" HEAD:refs/heads/broken...ref && test_must_fail git push "file://$(pwd)" HEAD:refs/heads/broken...ref &&
git branch >output 2>error && git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error && ! grep -e "broken\.\.\.ref" error &&
@ -139,7 +141,7 @@ test_expect_failure 'push --mirror can delete badly named ref' '
cd dest && cd dest &&
test_commit two && test_commit two &&
git checkout --detach && git checkout --detach &&
cp .git/refs/heads/main .git/refs/heads/broken...ref test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION
) && ) &&
git -C src push --mirror "file://$top/dest" && git -C src push --mirror "file://$top/dest" &&
git -C dest branch >output 2>error && git -C dest branch >output 2>error &&
@ -148,11 +150,11 @@ test_expect_failure 'push --mirror can delete badly named ref' '
' '
test_expect_success 'rev-parse skips symref pointing to broken name' ' test_expect_success 'rev-parse skips symref pointing to broken name' '
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch shadow one && git branch shadow one &&
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/tags/shadow && test-tool ref-store main create-symref refs/tags/shadow refs/heads/broken...ref msg &&
test_when_finished "rm -f .git/refs/tags/shadow" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/tags/shadow" &&
git rev-parse --verify one >expect && git rev-parse --verify one >expect &&
git rev-parse --verify shadow >actual 2>err && git rev-parse --verify shadow >actual 2>err &&
test_cmp expect actual && test_cmp expect actual &&
@ -160,12 +162,12 @@ test_expect_success 'rev-parse skips symref pointing to broken name' '
' '
test_expect_success 'for-each-ref emits warnings for broken names' ' test_expect_success 'for-each-ref emits warnings for broken names' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
test_when_finished "rm -f .git/refs/heads/badname" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref && printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
test_when_finished "rm -f .git/refs/heads/broken...symref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git for-each-ref >output 2>error && git for-each-ref >output 2>error &&
! grep -e "broken\.\.\.ref" output && ! grep -e "broken\.\.\.ref" output &&
! grep -e "badname" output && ! grep -e "badname" output &&
@ -176,8 +178,8 @@ test_expect_success 'for-each-ref emits warnings for broken names' '
' '
test_expect_success 'update-ref -d can delete broken name' ' test_expect_success 'update-ref -d can delete broken name' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git update-ref -d refs/heads/broken...ref >output 2>error && git update-ref -d refs/heads/broken...ref >output 2>error &&
test_must_be_empty output && test_must_be_empty output &&
test_must_be_empty error && test_must_be_empty error &&
@ -187,8 +189,8 @@ test_expect_success 'update-ref -d can delete broken name' '
' '
test_expect_success 'branch -d can delete broken name' ' test_expect_success 'branch -d can delete broken name' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch -d broken...ref >output 2>error && git branch -d broken...ref >output 2>error &&
test_i18ngrep "Deleted branch broken...ref (was broken)" output && test_i18ngrep "Deleted branch broken...ref (was broken)" output &&
test_must_be_empty error && test_must_be_empty error &&
@ -198,10 +200,11 @@ test_expect_success 'branch -d can delete broken name' '
' '
test_expect_success 'update-ref --no-deref -d can delete symref to broken name' ' test_expect_success 'update-ref --no-deref -d can delete symref to broken name' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
test_when_finished "rm -f .git/refs/heads/badname" && test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git update-ref --no-deref -d refs/heads/badname >output 2>error && git update-ref --no-deref -d refs/heads/badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname && test_path_is_missing .git/refs/heads/badname &&
test_must_be_empty output && test_must_be_empty output &&
@ -209,10 +212,10 @@ test_expect_success 'update-ref --no-deref -d can delete symref to broken name'
' '
test_expect_success 'branch -d can delete symref to broken name' ' test_expect_success 'branch -d can delete symref to broken name' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
test_when_finished "rm -f .git/refs/heads/badname" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git branch -d badname >output 2>error && git branch -d badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname && test_path_is_missing .git/refs/heads/badname &&
test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
@ -220,8 +223,8 @@ test_expect_success 'branch -d can delete symref to broken name' '
' '
test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' ' test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' '
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
test_when_finished "rm -f .git/refs/heads/badname" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git update-ref --no-deref -d refs/heads/badname >output 2>error && git update-ref --no-deref -d refs/heads/badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname && test_path_is_missing .git/refs/heads/badname &&
test_must_be_empty output && test_must_be_empty output &&
@ -229,8 +232,8 @@ test_expect_success 'update-ref --no-deref -d can delete dangling symref to brok
' '
test_expect_success 'branch -d can delete dangling symref to broken name' ' test_expect_success 'branch -d can delete dangling symref to broken name' '
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
test_when_finished "rm -f .git/refs/heads/badname" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git branch -d badname >output 2>error && git branch -d badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname && test_path_is_missing .git/refs/heads/badname &&
test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output && test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
@ -238,10 +241,10 @@ test_expect_success 'branch -d can delete dangling symref to broken name' '
' '
test_expect_success 'update-ref -d can delete broken name through symref' ' test_expect_success 'update-ref -d can delete broken name through symref' '
cp .git/refs/heads/main .git/refs/heads/broken...ref && test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "rm -f .git/refs/heads/broken...ref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname && test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
test_when_finished "rm -f .git/refs/heads/badname" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git update-ref -d refs/heads/badname >output 2>error && git update-ref -d refs/heads/badname >output 2>error &&
test_path_is_missing .git/refs/heads/broken...ref && test_path_is_missing .git/refs/heads/broken...ref &&
test_must_be_empty output && test_must_be_empty output &&
@ -250,7 +253,7 @@ test_expect_success 'update-ref -d can delete broken name through symref' '
test_expect_success 'update-ref --no-deref -d can delete symref with broken name' ' test_expect_success 'update-ref --no-deref -d can delete symref with broken name' '
printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref && printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
test_when_finished "rm -f .git/refs/heads/broken...symref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git update-ref --no-deref -d refs/heads/broken...symref >output 2>error && git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref && test_path_is_missing .git/refs/heads/broken...symref &&
test_must_be_empty output && test_must_be_empty output &&
@ -259,7 +262,7 @@ test_expect_success 'update-ref --no-deref -d can delete symref with broken name
test_expect_success 'branch -d can delete symref with broken name' ' test_expect_success 'branch -d can delete symref with broken name' '
printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref && printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
test_when_finished "rm -f .git/refs/heads/broken...symref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git branch -d broken...symref >output 2>error && git branch -d broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref && test_path_is_missing .git/refs/heads/broken...symref &&
test_i18ngrep "Deleted branch broken...symref (was refs/heads/main)" output && test_i18ngrep "Deleted branch broken...symref (was refs/heads/main)" output &&
@ -268,7 +271,7 @@ test_expect_success 'branch -d can delete symref with broken name' '
test_expect_success 'update-ref --no-deref -d can delete dangling symref with broken name' ' test_expect_success 'update-ref --no-deref -d can delete dangling symref with broken name' '
printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref && printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
test_when_finished "rm -f .git/refs/heads/broken...symref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git update-ref --no-deref -d refs/heads/broken...symref >output 2>error && git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref && test_path_is_missing .git/refs/heads/broken...symref &&
test_must_be_empty output && test_must_be_empty output &&
@ -277,7 +280,7 @@ test_expect_success 'update-ref --no-deref -d can delete dangling symref with br
test_expect_success 'branch -d can delete dangling symref with broken name' ' test_expect_success 'branch -d can delete dangling symref with broken name' '
printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref && printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
test_when_finished "rm -f .git/refs/heads/broken...symref" && test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git branch -d broken...symref >output 2>error && git branch -d broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref && test_path_is_missing .git/refs/heads/broken...symref &&
test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output && test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&

6
t/t3800-mktag.sh
View file

@ -72,7 +72,8 @@ check_verify_failure () {
# Manually create the broken, we cannot do it with # Manually create the broken, we cannot do it with
# update-ref # update-ref
echo "$bad_tag" >"bad-tag/$tag_ref" && test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
# Unlike fsck-ing unreachable content above, this # Unlike fsck-ing unreachable content above, this
# will always fail. # will always fail.
@ -83,7 +84,8 @@ check_verify_failure () {
# Make sure the earlier test created it for us # Make sure the earlier test created it for us
git rev-parse "$bad_tag" && git rev-parse "$bad_tag" &&
echo "$bad_tag" >"bad-tag/$tag_ref" && test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected && printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
git -C bad-tag for-each-ref "$tag_ref" >actual && git -C bad-tag for-each-ref "$tag_ref" >actual &&