summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-10 17:56:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-10 17:56:39 (GMT)
commit216d29ef257e48f95bc14765d5da17e7854a3109 (patch)
tree7cd0e31b75f442d9ae146f222b102b9982bd60ce /sequencer.c
parentd52adf1f328162a9513940913ced044d24c0212f (diff)
parent261f315bebfa9af2d09f20211960100ff06f87cb (diff)
downloadgit-216d29ef257e48f95bc14765d5da17e7854a3109.zip
git-216d29ef257e48f95bc14765d5da17e7854a3109.tar.gz
git-216d29ef257e48f95bc14765d5da17e7854a3109.tar.bz2
Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
* jc/conflict-hint: 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 git-tag.txt: Add a missing hyphen to `-s`
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c34
1 files changed, 19 insertions, 15 deletions
diff --git a/sequencer.c b/sequencer.c
index 5e8a207..f00fd7c 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -266,6 +266,23 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from,
return 0;
}
+void append_conflicts_hint(struct strbuf *msgbuf)
+{
+ int i;
+
+ strbuf_addch(msgbuf, '\n');
+ strbuf_commented_addf(msgbuf, "Conflicts:\n");
+ for (i = 0; i < active_nr;) {
+ const struct cache_entry *ce = active_cache[i++];
+ if (ce_stage(ce)) {
+ strbuf_commented_addf(msgbuf, "\t%s\n", ce->name);
+ while (i < active_nr && !strcmp(ce->name,
+ active_cache[i]->name))
+ i++;
+ }
+ }
+}
+
static int do_recursive_merge(struct commit *base, struct commit *next,
const char *base_label, const char *next_label,
unsigned char *head, struct strbuf *msgbuf,
@@ -306,21 +323,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
if (opts->signoff)
append_signoff(msgbuf, 0, 0);
- if (!clean) {
- int i;
- strbuf_addstr(msgbuf, "\nConflicts:\n");
- for (i = 0; i < active_nr;) {
- const struct cache_entry *ce = active_cache[i++];
- if (ce_stage(ce)) {
- strbuf_addch(msgbuf, '\t');
- strbuf_addstr(msgbuf, ce->name);
- strbuf_addch(msgbuf, '\n');
- while (i < active_nr && !strcmp(ce->name,
- active_cache[i]->name))
- i++;
- }
- }
- }
+ if (!clean)
+ append_conflicts_hint(msgbuf);
return !clean;
}