diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-02 18:17:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-02 18:17:35 -0700 |
| commit | 2f164c35fa8915ddd8e8a01809a9935ad900f13c (patch) | |
| tree | 4a8e5b79c63abd436aea600457775b5557937c25 /git-commit.sh | |
| parent | 20ff06805c66826404b154b9309a8581449af2b0 (diff) | |
| parent | 2052d146f60eaeeef50cb4d437e4a25051f8d8c3 (diff) | |
| download | git-2f164c35fa8915ddd8e8a01809a9935ad900f13c.tar.xz | |
Merge branch 'ds/doc' into jc/fmt-patch
* ds/doc:
Update documentation for git-format-patch
sha1_file: avoid re-preparing duplicate packs
handle concurrent pruning of packed objects
http: prevent segfault during curl handle reuse
Remove possible segfault in http-fetch.
gitk: show_error fix
[PATCH] gitk: start-up bugfix
[PATCH] gitk: Replace "git-" commands with "git "
[PATCH] gitk: Display commit messages with word wrap
gitk: Fix bug where page-up/down wouldn't always work properly
gitk: Fix display of "(...)" for parents/children we haven't drawn
send-email: only 'require' instead of 'use' Net::SMTP
Allow multiple -m options to git-commit.
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/git-commit.sh b/git-commit.sh index 1983d45828..15482d21b3 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -260,20 +260,41 @@ do -m|--m|--me|--mes|--mess|--messa|--messag|--message) case "$#" in 1) usage ;; esac shift - log_given=t$log_given - log_message="$1" + log_given=m$log_given + if test "$log_message" = '' + then + log_message="$1" + else + log_message="$log_message + +$1" + fi no_edit=t shift ;; -m*) - log_given=t$log_given - log_message=`expr "$1" : '-m\(.*\)'` + log_given=m$log_given + if test "$log_message" = '' + then + log_message=`expr "$1" : '-m\(.*\)'` + else + log_message="$log_message + +`expr "$1" : '-m\(.*\)'`" + fi no_edit=t shift ;; --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*) - log_given=t$log_given - log_message=`expr "$1" : '-[^=]*=\(.*\)'` + log_given=m$log_given + if test "$log_message" = '' + then + log_message=`expr "$1" : '-[^=]*=\(.*\)'` + else + log_message="$log_message + +`expr "$1" : '-[^=]*=\(.*\)'`" + fi no_edit=t shift ;; @@ -378,7 +399,9 @@ esac case "$log_given" in tt*) - die "Only one of -c/-C/-F/-m can be used." ;; + die "Only one of -c/-C/-F can be used." ;; +*tm*|*mt*) + die "Option -m cannot be combined with -c/-C/-F." ;; esac case "$#,$also,$only,$amend" in |