diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-10-28 12:44:09 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-10-28 12:44:09 -0700 |
commit | 073bd75e177aa9f1fc42b152a38e251c7156dfe0 (patch) | |
tree | 035e0c907468a704efdfa1a13a00e4f2a3160564 /t/t3507-cherry-pick-conflict.sh | |
parent | 75c961b767ec061696634c1079dbe5f1a9e10f93 (diff) | |
download | git-073bd75e177aa9f1fc42b152a38e251c7156dfe0.tar.gz |
builtin/commit.c: extract ignore_non_trailer() helper function
Extract a helper function from prepare_to_commit() to determine
where to place a new Signed-off-by: line, which is essentially the
true "end" of the log message, ignoring the trailing "Conflicts:"
line and everything below it.
The detection _should_ make sure the "Conflicts:" line it finds is
truly the conflict hint block by checking everything that follows is
a HT indented pathname to avoid false positive, but this logic will
be revamped in a later patch to ignore comments and blanks anyway,
so it is left as-is in this step.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions