From: Jeff King <peff@peff.net>
Date: Wed, 24 Oct 2012 07:31:37 +0000 (-0400)
Subject: Reintegrate: use --no-decorate with log --oneline
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afb85c76b2283b7689c69efabee7fe1719c385db;p=thirdparty%2Fgit.git

Reintegrate: use --no-decorate with log --oneline

Otherwise, the script gets confused and gives us a "Huh?"
line when log.decorate is set.
---

diff --git a/Reintegrate b/Reintegrate
index 17299f99b0..2a8b0ccad6 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -182,7 +182,7 @@ generate () {
 	echo "	exec $PROGRAM" '"$1" "$0"'
 	echo 'esac'
 	echo "$PROGRAM" '"$@" <<\EOF'
-	git log --pretty=oneline --first-parent "$1" |
+	git log --no-decorate --pretty=oneline --first-parent "$1" |
 	{
 		series=
 		while read commit msg