kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2020-11-11 13:18:39 -08:00
parent f2061f6982 c779386182
commit 7b66375e6f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sequencer.c
View File

@ -2651,7 +2651,7 @@ static int read_populate_opts(struct replay_opts *opts)
} }


if (read_oneliner(&buf, rebase_path_squash_onto(), 0)) { 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")); ret = error(_("unusable squash-onto"));
goto done_rebase_i; goto done_rebase_i;
} }