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 17299f99b05d766d4ba4a5810773224a33c2a72c..2a8b0ccad6d882d0e8abde93b02d02a9d91b5e88 100755 (executable)
--- 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