Thread (1 message) 1 message, 1 author, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:14

Fredrik Kuivinen [off-list ref] writes:
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).
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help