Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
use skip_prefix to avoid magic numbers
[gitweb.git]
/
builtin
/
fmt-merge-msg.c
diff --git
a/builtin/fmt-merge-msg.c
b/builtin/fmt-merge-msg.c
index 72378e6810a33b8d0e0285b14babc57b39287bb9..3c19241554da225423fb1f10eaaebb56db7e73fd 100644
(file)
--- a/
builtin/fmt-merge-msg.c
+++ b/
builtin/fmt-merge-msg.c
@@
-297,7
+297,7
@@
static void credit_people(struct strbuf *out,
if (!them->nr ||
(them->nr == 1 &&
me &&
-
(me = skip_prefix(me, them->items->string)) != NULL
&&
+
skip_prefix(me, them->items->string, &me)
&&
starts_with(me, " <")))
return;
strbuf_addf(out, "\n%c %s ", comment_line_char, label);