* [PATCH Cogito] Prevent '.git/merging: No such file or directory' error message
@ 2005-06-20 22:15 Marcel Holtmann
0 siblings, 0 replies; only message in thread
From: Marcel Holtmann @ 2005-06-20 22:15 UTC (permalink / raw)
To: Petr Baudis; +Cc: GIT Mailing List
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
Hi Petr,
the attached patch prevent the '.git/merging: No such file or directory'
error message.
Regards
Marcel
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
[-- Attachment #2: patch --]
[-- Type: text/x-patch, Size: 347 bytes --]
diff --git a/cg-merge b/cg-merge
--- a/cg-merge
+++ b/cg-merge
@@ -48,7 +48,7 @@ branch=$(commit-id "$branchname") || exi
[ -s $_git/blocked ] && die "merge blocked: $(cat $_git/blocked)"
-if grep -q "$branch" $_git/merging; then
+if grep -sq "$branch" $_git/merging; then
echo "Branch already merged in the working tree." >&2
echo 0
fi
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-06-20 22:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-06-20 22:15 [PATCH Cogito] Prevent '.git/merging: No such file or directory' error message Marcel Holtmann
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).