Re: [PATCH] merge-recursive: leave unmerged entries in the index.

From: Junio C Hamano <junkio@cox.net>
Date: Dec 11, 2005, 09:42 UTC
Message-ID: <7v64pwnf5d.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051211092531.GA4919@c165.ib.student.liu.se>

Fredrik Kuivinen <freku045@student.liu.se> writes:

Show 11 quoted lines

> It might be cleaner to use
>
> runProgram(['git-update-index', '-z', '--index-info'],
>            input="0 " + ("0" * 40) + "\t" + path + "\0" + \
>                  "%o %s %d\t%s\0" % (oMode, oSHA1, 1, path) + \
>                  "%o %s %d\t%s\0" % (aMode, aSHA1, 2, path) + \
>                  "%o %s %d\t%s\0" % (bMode, bSHA1, 3, path))
>
> here instead. With this code we will get an exception if
> git-update-index exits with an error code. It is also consistent with
> the rest of the code.

Thanks. I did not know how to feed the string through runProgram (well, I did not look close enough).