diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-15 17:02:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-15 17:02:31 -0700 |
| commit | 14fb44880c1143ae0259842c808c036e78b516f6 (patch) | |
| tree | 179b74d0c4013916191eac71ab05a9dc7968574f | |
| parent | Merge master changes into rc. (diff) | |
| parent | Tentative fix to git-commit-script (diff) | |
| download | tgif-14fb44880c1143ae0259842c808c036e78b516f6.tar.xz | |
Merge with master changes.
| -rwxr-xr-x | git-commit-script | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/git-commit-script b/git-commit-script index 5e6b877d1b..790f07c08f 100755 --- a/git-commit-script +++ b/git-commit-script @@ -167,6 +167,7 @@ if [ ! -r "$GIT_DIR/HEAD" ]; then no_edit= else if [ -f "$GIT_DIR/MERGE_HEAD" ]; then + { echo "#" echo "# It looks like your may be committing a MERGE." echo "# If this is not correct, please remove the file" @@ -177,10 +178,13 @@ else no_edit= esac echo "#" + } | + git-stripspace >.editmsg PARENTS="-p HEAD -p MERGE_HEAD" elif test "$log_message" != '' then - echo "$log_message" + echo "$log_message" | + git-stripspace >.editmsg elif test "$logfile" != "" then if test "$logfile" = - @@ -190,7 +194,8 @@ else cat else cat <"$logfile" - fi + fi | + git-stripspace >.editmsg elif test "$use_commit" != "" then pick_author_script=' @@ -220,9 +225,10 @@ else export GIT_AUTHOR_EMAIL export GIT_AUTHOR_DATE git-cat-file commit "$use_commit" | - sed -e '1,/^$/d' - fi | - git-stripspace >.editmsg + sed -e '1,/^$/d' | + git-stripspace >.editmsg + fi + case "$signoff" in t) git-var GIT_COMMITTER_IDENT | sed -e ' |