sequencer: tolerate abbreviated stopped-sha file
PATCH 1/1 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.
---
Not sure how big of a problem this will potentially be, but I noticed it and wanted to mention it.
--- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sequencer.c +1 -1
@@ -2653,7 +2653,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; }
Signature · 1 line
2.29.0.rc1.297.gfa9743e501-goog
Quoted 8 lines · Jonathan Tan
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).
Quoted 6 lines
Teach Git to allow object names of any length when reading.
Signed-off-by Jonathan Tan <[email protected]>---
Not sure how big of a problem this will potentially be, but I noticed it and wanted to mention it.
If I didn't mention that I deliberately chose to declare it a non-issue during the discussion, that was my mistake.
If this is not causing real-world problem, I'd in principle prefer to keep the "expect full hex when reading what's supposed to be written as full hex" sanity checking, but this is a file that is purely internal between the two invocation of the program and not even known by mere end users, so I could be persuaded to change my mind on this particular case.
Assuming that the "use case" is real, the patch is obviously correct. We won't write anything but a commit object name so using oid_committish() would not change the behaviour in good cases.
Thanks.
Quoted 17 lines
--- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sequencer.c +1
-1@@ -2653,7 +2653,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; }