{"thread":{"id":"995","subject":"[PATCH Cogito] Prevent '.git/merging: No such file or directory' error message","startedAt":"2005-06-20T22:15:14Z","lastAt":"2005-06-20T22:15:14Z","messageCount":1,"participants":["Marcel Holtmann"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"5093","messageId":"1119305714.26772.75.camel@pegasus","threadId":"995","inReplyTo":null,"subject":"[PATCH Cogito] Prevent '.git/merging: No such file or directory' error message","fromName":"Marcel Holtmann","fromEmail":"marcel@holtmann.org","sentAt":"2005-06-20T22:15:14Z","receivedAt":"2005-06-20T22:15:14Z","isPatch":true,"sender":{"key":"marcel@holtmann.org","avatar":null},"body":"Hi Petr,\n\nthe attached patch prevent the '.git/merging: No such file or directory'\nerror message.\n\nRegards\n\nMarcel\n\n\nSigned-off-by: Marcel Holtmann <marcel@holtmann.org>\n\n\n\ndiff --git a/cg-merge b/cg-merge\n--- a/cg-merge\n+++ b/cg-merge\n@@ -48,7 +48,7 @@ branch=$(commit-id \"$branchname\") || exi\n \n [ -s $_git/blocked ] && die \"merge blocked: $(cat $_git/blocked)\"\n \n-if grep -q \"$branch\" $_git/merging; then\n+if grep -sq \"$branch\" $_git/merging; then\n \techo \"Branch already merged in the working tree.\" >&2\n \techo 0\n fi\n"}]}