Merge branch 'jc/squash'

[git.git] / git-commit.sh

diff --git a/git-commit.sh b/git-commit.sh
index 9f49651cfdce101af3ba2c1980121d9ccea8a194..d7f3ade493762140c9a5a888ac67f8435e737f10 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -696,13 +696,18 @@ t)
        fi
 esac
 
-sed -e '
-    /^diff --git a\/.*/{
-       s///
-       q
-    }
-    /^#/d
-' "$GIT_DIR"/COMMIT_EDITMSG |
+if test -z "$no_edit"
+then
+    sed -e '
+        /^diff --git a\/.*/{
+           s///
+           q
+       }
+       /^#/d
+    ' "$GIT_DIR"/COMMIT_EDITMSG
+else
+    cat "$GIT_DIR"/COMMIT_EDITMSG
+fi |
 git-stripspace >"$GIT_DIR"/COMMIT_MSG
 
 if cnt=`grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |