X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-commit.sh;h=591fcdceb1a3d47ce311bda0b3a81b62e99f47fc;hb=d1c5f2a42d7b5c0e3d3862212dea1f09809c4963;hp=1206c20c2eca1edfb9318891d8237685d237c945;hpb=8098a178b26dc7a158d129a092a5b78da6d12b72;p=git.git diff --git a/git-commit.sh b/git-commit.sh index 1206c20c..591fcdce 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -133,10 +133,13 @@ fi | git-stripspace >.editmsg case "$signoff" in t) - git-var GIT_COMMITTER_IDENT | sed -e ' - s/>.*/>/ - s/^/Signed-off-by: / - ' >>.editmsg + { + echo + git-var GIT_COMMITTER_IDENT | sed -e ' + s/>.*/>/ + s/^/Signed-off-by: / + ' + } >>.editmsg ;; esac @@ -195,7 +198,7 @@ else PARENTS="" fi git-status >>.editmsg -if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ] +if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ] then rm -f .editmsg git-status