mirror of
https://github.com/git/git
synced 2024-10-05 16:19:28 +00:00
sequencer: tighten label lookups
The `label` command creates a ref refs/rewritten/<label> that the `reset` and `merge` commands resolve by calling lookup_label(). That uses lookup_commit_reference_by_name() to look up the label ref. As lookup_commit_reference_by_name() uses the dwim rules when looking up the label it will look for a branch named refs/heads/refs/rewritten/<label> and return that instead of an error if the branch exists and the label does not. Fix this by using read_ref() followed by lookup_commit_object() when looking up labels. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Taylor Blau <me@ttaylorr.com>
This commit is contained in:
parent
82766b2961
commit
688d82f254
14
sequencer.c
14
sequencer.c
|
@ -3694,15 +3694,17 @@ static const char *reflog_message(struct replay_opts *opts,
|
||||||
return buf.buf;
|
return buf.buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct commit *lookup_label(const char *label, int len,
|
static struct commit *lookup_label(struct repository *r, const char *label,
|
||||||
struct strbuf *buf)
|
int len, struct strbuf *buf)
|
||||||
{
|
{
|
||||||
struct commit *commit;
|
struct commit *commit;
|
||||||
|
struct object_id oid;
|
||||||
|
|
||||||
strbuf_reset(buf);
|
strbuf_reset(buf);
|
||||||
strbuf_addf(buf, "refs/rewritten/%.*s", len, label);
|
strbuf_addf(buf, "refs/rewritten/%.*s", len, label);
|
||||||
commit = lookup_commit_reference_by_name(buf->buf);
|
if (!read_ref(buf->buf, &oid)) {
|
||||||
if (!commit) {
|
commit = lookup_commit_object(r, &oid);
|
||||||
|
} else {
|
||||||
/* fall back to non-rewritten ref or commit */
|
/* fall back to non-rewritten ref or commit */
|
||||||
strbuf_splice(buf, 0, strlen("refs/rewritten/"), "", 0);
|
strbuf_splice(buf, 0, strlen("refs/rewritten/"), "", 0);
|
||||||
commit = lookup_commit_reference_by_name(buf->buf);
|
commit = lookup_commit_reference_by_name(buf->buf);
|
||||||
|
@ -3753,7 +3755,7 @@ static int do_reset(struct repository *r,
|
||||||
break;
|
break;
|
||||||
len = i;
|
len = i;
|
||||||
|
|
||||||
commit = lookup_label(name, len, &ref_name);
|
commit = lookup_label(r, name, len, &ref_name);
|
||||||
if (!commit) {
|
if (!commit) {
|
||||||
ret = -1;
|
ret = -1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
@ -3852,7 +3854,7 @@ static int do_merge(struct repository *r,
|
||||||
k = strcspn(p, " \t\n");
|
k = strcspn(p, " \t\n");
|
||||||
if (!k)
|
if (!k)
|
||||||
continue;
|
continue;
|
||||||
merge_commit = lookup_label(p, k, &ref_name);
|
merge_commit = lookup_label(r, p, k, &ref_name);
|
||||||
if (!merge_commit) {
|
if (!merge_commit) {
|
||||||
ret = error(_("unable to parse '%.*s'"), k, p);
|
ret = error(_("unable to parse '%.*s'"), k, p);
|
||||||
goto leave_merge;
|
goto leave_merge;
|
||||||
|
|
|
@ -146,6 +146,15 @@ test_expect_success '`reset` rejects trees' '
|
||||||
test_must_be_empty out
|
test_must_be_empty out
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success '`reset` only looks for labels under refs/rewritten/' '
|
||||||
|
test_when_finished "test_might_fail git rebase --abort" &&
|
||||||
|
git branch refs/rewritten/my-label A &&
|
||||||
|
test_must_fail env GIT_SEQUENCE_EDITOR="echo reset my-label >" \
|
||||||
|
git rebase -i B C >out 2>err &&
|
||||||
|
grep "could not resolve ${SQ}my-label${SQ}" err &&
|
||||||
|
test_must_be_empty out
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'failed `merge -C` writes patch (may be rescheduled, too)' '
|
test_expect_success 'failed `merge -C` writes patch (may be rescheduled, too)' '
|
||||||
test_when_finished "test_might_fail git rebase --abort" &&
|
test_when_finished "test_might_fail git rebase --abort" &&
|
||||||
git checkout -b conflicting-merge A &&
|
git checkout -b conflicting-merge A &&
|
||||||
|
|
Loading…
Reference in a new issue