| Message ID | 20200716173221.103295-1-phillip.wood123@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | cleanup ra/rebase-i-more-options | expand |
Phillip Wood <phillip.wood123@gmail.com> writes: > format-patch and am could do with having their similar messages > updated in the future That's a good #leftoverbits topic.
Hi Phillip, On Thu, 16 Jul 2020, Phillip Wood wrote: > From: Phillip Wood <phillip.wood@dunelm.org.uk> > > Danh pointed out that the word "ident" gets misinterpreted by > translators as "indentation" leading to incorrect translations so I've > reworded an error message. > > format-patch and am could do with having their similar messages > updated in the future Thank you for this patch series! To be honest, my hope was that I would get support for `git rebase -i --whitespace=fix` out of that GSoC project... but I take what I can get, and this patch series is in a pretty good shape. I offered three small suggestions how I think it could be improved, still, but I would be pretty happy with seeing the patches moving to `next` as-are. Thank you, Dscho > > Phillip Wood (2): > rebase -i: support --committer-date-is-author-date > rebase -i: support --ignore-date > > Rohit Ashiwal (3): > rebase -i: add --ignore-whitespace flag > sequencer: rename amend_author to author_to_free > rebase: add --reset-author-date > > Documentation/git-rebase.txt | 33 ++++- > builtin/rebase.c | 47 +++++-- > sequencer.c | 112 ++++++++++++++- > sequencer.h | 2 + > t/t3422-rebase-incompatible-options.sh | 2 - > t/t3436-rebase-more-options.sh | 180 +++++++++++++++++++++++++ > 6 files changed, 353 insertions(+), 23 deletions(-) > create mode 100755 t/t3436-rebase-more-options.sh > > Range-diff against v6: > 1: 0fc90eaff1 ! 1: 3865fdf461 rebase -i: support --ignore-date > @@ sequencer.c: static const char *author_date_from_env_array(const struct argv_arr > + struct strbuf new_author = STRBUF_INIT; > + > + if (split_ident_line(&ident, author, strlen(author)) < 0) { > -+ error(_("malformed ident line '%s'"), author); > ++ error(_("invalid author identity: %s"), author); > + return NULL; > + } > + > 2: 21cf5e5512 = 2: 0b6b19cb68 rebase: add --reset-author-date > -- > 2.27.0 > >
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > I offered three small suggestions how I think it could be improved, still, > but I would be pretty happy with seeing the patches moving to `next` > as-are. I tend to agree with those points I saw you mentioned. The unconditional exporting of the committer-date without undoing looked like a bad pattern waiting to be copied and pasted. I have not yet fully followed the codepath but I tend to agree with your suspicion that commit_tree_extended() might be a better place to do this. Thanks.
On 13/08/2020 18:46, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > >> I offered three small suggestions how I think it could be improved, still, >> but I would be pretty happy with seeing the patches moving to `next` >> as-are. > > I tend to agree with those points I saw you mentioned. > > The unconditional exporting of the committer-date without undoing > looked like a bad pattern waiting to be copied and pasted. I think it is copied and pasted from builtin/am.c > I have not yet fully followed the codepath but I tend to agree with > your suspicion that commit_tree_extended() might be a better place > to do this. It looks like it should be simple enough to do that, I'll reroll Thanks for your comments dscho Phillip > Thanks. >
From: Phillip Wood <phillip.wood@dunelm.org.uk> Danh pointed out that the word "ident" gets misinterpreted by translators as "indentation" leading to incorrect translations so I've reworded an error message. format-patch and am could do with having their similar messages updated in the future Phillip Wood (2): rebase -i: support --committer-date-is-author-date rebase -i: support --ignore-date Rohit Ashiwal (3): rebase -i: add --ignore-whitespace flag sequencer: rename amend_author to author_to_free rebase: add --reset-author-date Documentation/git-rebase.txt | 33 ++++- builtin/rebase.c | 47 +++++-- sequencer.c | 112 ++++++++++++++- sequencer.h | 2 + t/t3422-rebase-incompatible-options.sh | 2 - t/t3436-rebase-more-options.sh | 180 +++++++++++++++++++++++++ 6 files changed, 353 insertions(+), 23 deletions(-) create mode 100755 t/t3436-rebase-more-options.sh Range-diff against v6: 1: 0fc90eaff1 ! 1: 3865fdf461 rebase -i: support --ignore-date @@ sequencer.c: static const char *author_date_from_env_array(const struct argv_arr + struct strbuf new_author = STRBUF_INIT; + + if (split_ident_line(&ident, author, strlen(author)) < 0) { -+ error(_("malformed ident line '%s'"), author); ++ error(_("invalid author identity: %s"), author); + return NULL; + } + 2: 21cf5e5512 = 2: 0b6b19cb68 rebase: add --reset-author-date