From: Fredrik Kuivinen <freku045@student.liu.se>
To: Fredrik Kuivinen <freku045@student.liu.se>
Cc: Roberto Nibali <ratz@drugphish.ch>, git@vger.kernel.org, junkio@cox.net
Subject: [PATCH] merge-recursive: Improve the error message printed when merge(1) isn't found.
Date: Sun, 29 Jan 2006 13:16:08 +0100 [thread overview]
Message-ID: <20060129121608.GC4815@c165.ib.student.liu.se> (raw)
In-Reply-To: <20060129120344.GB4815@c165.ib.student.liu.se>
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
---
git-merge-recursive.py | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
75cd8eff434fd6e9cf7fff98f13a27bfaa1b363b
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 56c3641..b17c8e5 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -205,11 +205,16 @@ def mergeFile(oPath, oSha, oMode, aPath,
orig = runProgram(['git-unpack-file', oSha]).rstrip()
src1 = runProgram(['git-unpack-file', aSha]).rstrip()
src2 = runProgram(['git-unpack-file', bSha]).rstrip()
- [out, code] = runProgram(['merge',
- '-L', branch1Name + '/' + aPath,
- '-L', 'orig/' + oPath,
- '-L', branch2Name + '/' + bPath,
- src1, orig, src2], returnCode=True)
+ try:
+ [out, code] = runProgram(['merge',
+ '-L', branch1Name + '/' + aPath,
+ '-L', 'orig/' + oPath,
+ '-L', branch2Name + '/' + bPath,
+ src1, orig, src2], returnCode=True)
+ except ProgramError, e:
+ print >>sys.stderr, e
+ die("Failed to execute 'merge'. merge(1) is used as the "
+ "file-level merge tool. Is 'merge' in your path?")
sha = runProgram(['git-hash-object', '-t', 'blob', '-w',
src1]).rstrip()
--
0.99.9k.g3480-dirty
next prev parent reply other threads:[~2006-01-29 12:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-28 10:53 No merge strategy handled the merge (git version 1.1.GIT) Roberto Nibali
2006-01-29 12:03 ` Fredrik Kuivinen
2006-01-29 12:16 ` Fredrik Kuivinen [this message]
2006-01-29 23:42 ` [PATCH] merge-recursive: Improve the error message printed when merge(1) isn't found Roberto Nibali
2006-01-29 12:23 ` No merge strategy handled the merge (git version 1.1.GIT) Radoslaw Szkodzinski
2006-01-29 12:32 ` Radoslaw Szkodzinski
2006-01-29 23:42 ` Roberto Nibali
2006-01-29 23:50 ` Junio C Hamano
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=20060129121608.GC4815@c165.ib.student.liu.se \
--to=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=ratz@drugphish.ch \
/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;
as well as URLs for NNTP newsgroup(s).