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>
Jonathan Tan committed
Oct 21, 2020 at 15:03 UTC
c77938618298539df9102c55fdb3817c5ac2f43d
1 file changed
+1
-1
sequencer.c
+1
-1
@@ -2552,7 +2552,7 @@ static int read_populate_opts(struct replay_opts *opts)
2552
}
2553
2554
if (read_oneliner(&buf, rebase_path_squash_onto(), 0)) {
2555
- if (get_oid_hex(buf.buf, &opts->squash_onto) < 0) {
2555
+ if (get_oid_committish(buf.buf, &opts->squash_onto) < 0) {
2556
ret = error(_("unusable squash-onto"));
2557
goto done_rebase_i;
2558
}