Remove "appendix" information from commit message #19
Conversation
|
BTW I had this finished before you mentioned having removal be email-only. I'm happy to add a boolean argument to |
There was a problem hiding this comment.
NB that this patch will separate out an "appendix" even from the output of git log, which presumably has already been checked in
I think I'd like to take the conservative approach to start with and only do this separation in the email case, where we reasonably expect the input to contain an appendix. I'd rather not surprise people who happen to have this line for other purposes in non-email patches (even if it is unlikely).
I think the boolean argument is the cleanest way to implement it.
...when parsing emails, similar to `git am`. Add a new field, `BodyAppendix` to PatchHeader. Modify `scanMessageBody` to accept a boolean argument saying whether to separate out the appendix or not. Do this by keeping two string builders, and having it switch to the appendix builder when it finds a `---` line. Handling the newlines at the end as expected requires moving things around a bit. First, we were trimming space from the line once to decide whether the line was empty, and then trimming space again if we determined it wasn't empty. This only needs to be done once. Then, do all the trimming (both of whitespace and the prefix) first, before deciding what to do about the line. Request BodyAppendix separately when parsing a mail, but not a commit message. Add some tests to verify that it works as expected. Signed-off-by: George Dunlap <george.dunlap@citrix.com>
gwd
force-pushed
the
working/remove-appendix
branch
from
179be46 to
c01d938
Compare
|
Thanks for the review; I've made the requested changes. |
...similar to
git am.Add a new field,
BodyAppendixto PatchHeader.Modify
scanMessageBodyto return both the body and the appendix.Do this by keeping two string builders, and having it switch to the
appendix builder when it finds a
---line.Handling the newlines at the end as expected requires moving things
around a bit.
First, we were trimming space from the line once to decide whether the
line was empty, and then trimming space again if we determined it
wasn't empty. This only needs to be done once.
Then, do all the trimming (both of whitespace and the prefix) first,
before deciding what to do about the line.
Add some tests to verify that it works as expected.
NB that this patch will separate out an "appendix" even from the
output of
git log, which presumably has already been checked in. Ifthis is not the desired behavior, we could either:
Make the
---check after trimming whitespace, but before trimmingthe indent, or
Pass in a boolean to tell scanMessageBody not to separate out
appendix material if we're calling from parseHeaderPretty.
Signed-off-by: George Dunlap george.dunlap@citrix.com