diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-01 06:06:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-01 06:06:40 (GMT) |
| commit | 95dd4b2b14db912b482320c0a69518e77e7af19a (patch) | |
| tree | 2669be208ec8d5660fa69ebda9006e16a0abd3d7 /sequencer.c | |
| parent | cbb408e6aef5b0d06facc16bb7a8615925894ad4 (diff) | |
| parent | 5971b0836eece0ffcafe15fd5d67934787ea1777 (diff) | |
| download | git-95dd4b2b14db912b482320c0a69518e77e7af19a.zip git-95dd4b2b14db912b482320c0a69518e77e7af19a.tar.gz git-95dd4b2b14db912b482320c0a69518e77e7af19a.tar.bz2 | |
Merge branch 'js/rebase-recreate-merge'
Hotfixes.
* js/rebase-recreate-merge:
sequencer: ensure labels that are object IDs are rewritten
git-rebase--interactive: fix copy-paste mistake
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 560fc9b..cca9680 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3792,7 +3792,7 @@ static const char *label_oid(struct object_id *oid, const char *label, p[i] = save; } } - } else if (((len = strlen(label)) == GIT_SHA1_RAWSZ && + } else if (((len = strlen(label)) == the_hash_algo->hexsz && !get_oid_hex(label, &dummy)) || (len == 1 && *label == '#') || hashmap_get_from_hash(&state->labels, |