git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH Cogito] Prevent '.git/merging: No such file or directory' error message

From
MHMarcel Holtmann <marcel@holtmann.org>
Date
Jun 20, 2005, 22:15 UTC
Message-ID
<1119305714.26772.75.camel@pegasus>
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>
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
Message 1 of 1 in “Prevent '.git/merging: No such file or directory' error message”
  1. Prevent '.git/merging: No such file or directory' error messageMarcel Holtmann, Jun 20, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.