Re: [PATCH 4/3] Fold get_merge_bases_clean() into get_merge_bases()

From: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Jul 2, 2006, 20:59 UTC
Message-ID: <44A8339B.7070608@lsrfire.ath.cx>
In-Reply-To: <7vmzbr50b3.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano schrieb:

Show 11 quoted lines

> Rene Scharfe <rene.scharfe@lsrfire.ath.cx> writes:
> 
>>> I suspect the only way to fix that is to make "get_merge_bases()" not use 
>>> UNINTERESTING at all, but instead just explicitly use something like
>> No and yes.  Patch 1 in the 3+1 series changes the flags used in
>> commit.c to not conflict with the ones in revision.h[*].  So we have two
>> different UNINTERESTINGs, and get_merge_bases() doesn't mess up the
>> show/no-show markings.
> 
> Gaah.  commit.c defines its own UNINTERESTING and you rely on
> not including revision.h which is ... gasp ... #$@#$!!!

You mean crap? Yes, it is. That's why I said we should centralize the commit flags. There are several duplicate names for different commit flags in different files. I couldn't come up with a clean solution, though.

I have an idea. Would it help to gather a list of all commit object flags from the different files? And then we would come up with unique names? And then move the definition of all of them to commit.h?

René