diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-11 21:18:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 21:18:40 (GMT) |
| commit | 7b66375e6fbec4a813ed6c000f5c18fe53c1f824 (patch) | |
| tree | e804867208823a586fdb05bb6a743b6f993acd14 /sequencer.c | |
| parent | f2061f698292c966498d1caec7c5ce9e2e8f67a3 (diff) | |
| parent | c77938618298539df9102c55fdb3817c5ac2f43d (diff) | |
| download | git-7b66375e6fbec4a813ed6c000f5c18fe53c1f824.zip git-7b66375e6fbec4a813ed6c000f5c18fe53c1f824.tar.gz git-7b66375e6fbec4a813ed6c000f5c18fe53c1f824.tar.bz2 | |
Merge branch 'jc/sequencer-stopped-sha-simplify'
Recently the format of an internal state file "rebase -i" uses has
been tightened up for consistency, which would hurt those who start
"rebase -i" with old git and then continue with new git. Loosen
the reader side a bit (which we may want to tighten again in a year
or so).
* jc/sequencer-stopped-sha-simplify:
sequencer: tolerate abbreviated stopped-sha file
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 1244396..684ea9d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2651,7 +2651,7 @@ static int read_populate_opts(struct replay_opts *opts) } if (read_oneliner(&buf, rebase_path_squash_onto(), 0)) { - if (get_oid_hex(buf.buf, &opts->squash_onto) < 0) { + if (get_oid_committish(buf.buf, &opts->squash_onto) < 0) { ret = error(_("unusable squash-onto")); goto done_rebase_i; } |