From: Junio C Hamano <junkio@cox.net>
To: Fredrik Kuivinen <freku045@student.liu.se>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge-recursive: leave unmerged entries in the index.
Date: Sun, 11 Dec 2005 01:42:38 -0800 [thread overview]
Message-ID: <7v64pwnf5d.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20051211092531.GA4919@c165.ib.student.liu.se> (Fredrik Kuivinen's message of "Sun, 11 Dec 2005 10:25:31 +0100")
Fredrik Kuivinen <freku045@student.liu.se> 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).
prev parent reply other threads:[~2005-12-11 9:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-11 6:26 [PATCH] merge-recursive: leave unmerged entries in the index Junio C Hamano
2005-12-11 9:25 ` Fredrik Kuivinen
2005-12-11 9:42 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v64pwnf5d.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=freku045@student.liu.se \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox