| commit | c77938618298539df9102c55fdb3817c5ac2f43d | |
| author | Jonathan Tan <jonathantanmy@google.com> | |
| Wed, 21 Oct 2020 22:03:53 +0000 (21 15:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Oct 2020 06:04:16 +0000 (21 23:04 -0700) | ||
| tree | 7e02ad01c39718315b4487d59a2a57fc331807da | treesnapshot (tar.gz zip) |
| parent | 0512eabd915a6a7e79b368bf6408b36bbdc56386 | commitdiff |
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>
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>
| sequencer.c | diffblobblamehistory |