Fix a quoting bug with ./commit -a 'A U Thor'.

* clcommit.m4sh (func_commit): Use func_show_eval when calling
git, so that the previously func_quote_for_eval()ed $git_flags is
expanded properly.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/ChangeLog b/ChangeLog
index 054399949ebac2b809a112675ecf082b26838e54..a1bc4653a53c34aa7458343888ec81608372243e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-09  Gary V. Vaughan  <gary@gnu.org>
+
+       Fix a quoting bug with ./commit -a 'A U Thor'.
+       * clcommit.m4sh (func_commit): Use func_show_eval when calling
+       git, so that the previously func_quote_for_eval()ed $git_flags is
+       expanded properly.
+
 2009-09-15  Peter Rosin  <peda@lysator.liu.se>
 
        Don't try the MSYS libdir path on MinGW.

diff --git a/clcommit.m4sh b/clcommit.m4sh
index 93d5f99249a756cf27c6658bb71ab395698319cd..6157cd295ac7d3bac4d065efdcff74a7e68c047a 100644 (file)
--- a/clcommit.m4sh
+++ b/clcommit.m4sh
@@ -266,18 +266,11 @@ func_commit ()
     test $# -gt 0 && subject="$@"
 
     test $# -gt 0 || { set dummy -a; shift; }
-    func_verbose "$GIT commit $git_flags -F $log_file ${1+$@}"
-    $opt_dry_run ||
-        $GIT commit $git_flags -F $log_file ${1+"$@"} || exit $EXIT_FAILURE
+    func_show_eval "$GIT commit $git_flags -F $log_file ${1+$@}" "exit $EXIT_FAILURE"
 
     $opt_push && {
-      func_verbose "$GIT push"
-      $opt_dry_run || $GIT push
-
-      $opt_tags && {
-         func_verbose "$GIT push --tags"
-         $opt_dry_run || $GIT push --tags
-      }
+      func_show_eval "$GIT push"
+      $opt_tags && func_show_eval "$GIT push --tags"
     }
 
     :