Junio C Hamano <gitster@xxxxxxxxx> writes: > [earlier] https://lore.kernel.org/git/xmqq7cn4g3nx.fsf@gitster.g/ > > Junio C Hamano (2): > strbuf: retire strbuf_commented_addf() > strbuf: retire strbuf_commented_lines() This of course has a semantic conflict with the change that hides not just "the_repository" and functions that implicitly use that variable but other unrelated globals from environment.h behind a compatibility macro. A trivial merge-fix to be used to annotate the merge to make it an evil merge whose result compiles looks like this: merge-fix/jc/strbuf-commented-something diff --git a/strbuf.c b/strbuf.c index 05a6dc944b..cb972b07f7 100644 --- a/strbuf.c +++ b/strbuf.c @@ -7,6 +7,14 @@ #include "utf8.h" #include "date.h" +/* + * We do not need the_repository at all, but the comment_line_str is + * hidden behind USE_THE_REPOSITORY_VARIABLE CPP macro. We could + * #define it before including "envirnoment.h". Or we can make an + * external declaration ourselves here. + */ +extern const char *comment_line_str; + int starts_with(const char *str, const char *prefix) { for (; ; str++, prefix++)
