summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 12:26:23 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-22 12:26:24 -0800
commit0ed8a4e161c06b82734f5f5268a5b1fb68abb954 (patch)
tree3adfc815939e2ce7688b69d3463cdb9b19dca5ab /commit.h
parent3f1509809e728b70ea7912e4e1b40f22965e45ee (diff)
parent3d24a7267dd9b57b864d119a533bdfdfaccd9161 (diff)
downloadgit-0ed8a4e161c06b82734f5f5268a5b1fb68abb954.tar.gz
Merge branch 'cc/interpret-trailers-more'
"git interpret-trailers" learned to properly handle the "Conflicts:" block at the end. * cc/interpret-trailers-more: trailer: add test with an old style conflict block trailer: reuse ignore_non_trailer() to ignore conflict lines commit: make ignore_non_trailer() non static merge & sequencer: turn "Conflicts:" hint into a comment builtin/commit.c: extract ignore_non_trailer() helper function merge & sequencer: unify codepaths that write "Conflicts:" hint builtin/merge.c: drop a parameter that is never used
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index bc68ccbe69..cd35ac150a 100644
--- a/commit.h
+++ b/commit.h
@@ -337,6 +337,9 @@ extern void free_commit_extra_headers(struct commit_extra_header *extra);
extern const char *find_commit_header(const char *msg, const char *key,
size_t *out_len);
+/* Find the end of the log message, the right place for a new trailer. */
+extern int ignore_non_trailer(struct strbuf *sb);
+
typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
void *cb_data);