diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2020-10-21 15:03:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-21 23:04:16 -0700 |
| commit | c77938618298539df9102c55fdb3817c5ac2f43d (patch) | |
| tree | 7e02ad01c39718315b4487d59a2a57fc331807da /sequencer.c | |
| parent | 0512eabd915a6a7e79b368bf6408b36bbdc56386 (diff) | |
| download | git-c77938618298539df9102c55fdb3817c5ac2f43d.tar.gz | |
sequencer: tolerate abbreviated stopped-sha file
In 0512eabd91 ("sequencer: stop abbreviating stopped-sha file",
2020-09-25), Git was taught both to write full object names to the
stopped-sha file and to require full object names when reading. However,
a user would experience a problem if they started an interactive rebase
using an old version of Git and then continued with a current version of
Git (for example, if the system version of Git was updated in the
meantime).
Teach Git to allow object names of any length when reading.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 7dc9088d09..43b06d8950 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2552,7 +2552,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; } |