Skip to content

Commit 7b66375

Browse files
committed
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
2 parents f2061f6 + c779386 commit 7b66375

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sequencer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2651,7 +2651,7 @@ static int read_populate_opts(struct replay_opts *opts)
26512651
}
26522652

26532653
if (read_oneliner(&buf, rebase_path_squash_onto(), 0)) {
2654-
if (get_oid_hex(buf.buf, &opts->squash_onto) < 0) {
2654+
if (get_oid_committish(buf.buf, &opts->squash_onto) < 0) {
26552655
ret = error(_("unusable squash-onto"));
26562656
goto done_rebase_i;
26572657
}

0 commit comments

Comments
 (0)