Re: master has some toys

From: Junio C Hamano <junkio@cox.net>
Date: Nov 18, 2005, 20:09 UTC
Message-ID: <7vu0e9hg5k.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7vveyrt6ms.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:

I just had a small excitement finding out I did something right and felt an urge to brag ;-).

Show 20 quoted lines

> I am not so sure about forcing people upgrade, but we may end up
> deciding it is better not to have NO_MMAP as the default.  If
> that turns out to be the case, I'd prefer to have something like
> this instead:
>
> diff --git a/Makefile b/Makefile
> index 7ce62e8..215abf0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -213,6 +213,10 @@ endif
>  ifeq ($(uname_O),Cygwin)
>  	NO_STRCASESTR = YesPlease
>  	NEEDS_LIBICONV = YesPlease
> +	# There are conflicting reports about this.
> +	# On some boxes NO_MMAP is needed, and not so elsewhere.
> +	# Try uncommenting this if you see things break -- YMMV.
> +	# NO_MMAP = YesPlease
>  	NO_IPV6 = YesPlease
>  	X = .exe
>  endif

I did the above patch on top of "pu", which contained the patch from Pavel Roskin and sent it out. Later I saved the message from my mbox, went back to the "master" branch, whose Makefile had the releveant part like this:

        ifeq ($(uname_O),Cygwin)
                NO_STRCASESTR = YesPlease
                NEEDS_LIBICONV = YesPlease
                NO_IPV6 = YesPlease
                X = .exe
                ALL_CFLAGS += -DUSE_SYMLINK_HEAD=0
        endif

Notice ALL_CFLAGS line? The patch does not apply cleanly and usual e-mail patch application tool would have barfed; git-apply would not allow any fuzz, and patch would have dropped a .rej file.

However, I usually run "git-am" with --3way option enabled when applying the e-mailed patches. After git-apply failed, it noticed I am applying on top of a different blob, namely, the Makefile from somewhere else (it reads the "index 7ce62e8"), then fell back on 3-way merge and made a clean commit. Happy.

Back to day-job.