From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jun 2012 04:15:36 +0000 (-0700)
Subject: Meta/Reintegrate: work around minor --no-edit breakage
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5873c4d69f93d852c3ecca0d40f74035620a3c7;p=thirdparty%2Fgit.git

Meta/Reintegrate: work around minor --no-edit breakage

For --no-edit to be true replacement of one-shot export of EDITOR=:,
it should trigger stripspace() to remove comments, but currently it
doesn't.  Avoid using it for now.
---

diff --git a/Reintegrate b/Reintegrate
index 98fb07dde8..419e9127d9 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -100,7 +100,7 @@ no)
 			mb=$(git merge-base "$tip" "$save")
 			test "$mb" = "$tip" && continue
 
-			git merge $accept_rerere --no-edit "$branch" ||
+			EDITOR=: git merge $accept_rerere "$branch" ||
 			accept_rerere ||
 			exit