git-commit: add a --interactive option

The --interactive option behaves like "git commit", except that
"git add --interactive" is executed before committing.  It is
incompatible with -a and -i.

Signed-off-by: Paolo Bonzini  <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 2187eee4164038346ed7a3ae32f563aeb74f23f7..53a7bb0895036e4d66086b8c656e74588c82c38c 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -8,8 +8,9 @@ git-commit - Record changes to the repository
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg> |
-           --amend] [--no-verify] [-e] [--author <author>]
+'git-commit' [-a | --interactive] [-s] [-v]
+          [(-c | -C) <commit> | -F <file> | -m <msg> | --amend]
+          [--no-verify] [-e] [--author <author>]

           [--] [[-i | -o ]<file>...]
 
 DESCRIPTION
           [--] [[-i | -o ]<file>...]
 
 DESCRIPTION


@@ -35,6 +36,10 @@ methods:
    before, and to automatically "rm" files that have been
    removed from the working tree, and perform the actual commit.
 
    before, and to automatically "rm" files that have been
    removed from the working tree, and perform the actual commit.
 

+5. by using the --interactive switch with the 'commit' command to decide one
+   by one which files should be part of the commit, before finalizing the
+   operation.  Currently, this is done by invoking `git-add --interactive`.
+

 The gitlink:git-status[1] command can be used to obtain a
 summary of what is included by any of the above for the next
 commit by giving the same set of parameters you would give to
 The gitlink:git-status[1] command can be used to obtain a
 summary of what is included by any of the above for the next
 commit by giving the same set of parameters you would give to

diff --git a/git-commit.sh b/git-commit.sh
index b8c00b823656f36f6a6f38493b9569831db713b1..3656d607d5b91d8d125b5a72b6a2a00aee512618 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2006 Junio C Hamano
 
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2006 Junio C Hamano
 

-USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [[-i | -o] <path>...]'
+USAGE='[-a | --interactive] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [[-i | -o] <path>...]'

 SUBDIRECTORY_OK=Yes
 . git-sh-setup
 require_work_tree
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
 require_work_tree


@@ -71,6 +71,7 @@ trap '
 
 all=
 also=
 
 all=
 also=

+interactive=

 only=
 logfile=
 use_commit=
 only=
 logfile=
 use_commit=


@@ -131,6 +132,11 @@ do
                also=t
                shift
                ;;
                also=t
                shift
                ;;

+       --int|--inte|--inter|--intera|--interac|--interact|--interacti|\
+       --interactiv|--interactive)
+               interactive=t
+               shift
+               ;;

        -o|--o|--on|--onl|--only)
                only=t
                shift
        -o|--o|--on|--onl|--only)
                only=t
                shift


@@ -304,12 +310,14 @@ case "$#,$also,$only,$amend" in
        ;;
 esac
 unset only
        ;;
 esac
 unset only

-case "$all,$also,$#" in
-t,t,*)
-       die "Cannot use -a and -i at the same time." ;;
+case "$all,$interactive,$also,$#" in
+*t,*t,*)
+       die "Cannot use -a, --interactive or -i at the same time." ;;

 t,,[1-9]*)
        die "Paths with -a does not make sense." ;;
 t,,[1-9]*)
        die "Paths with -a does not make sense." ;;

-,t,0)
+,t,[1-9]*)
+       die "Paths with --interactive does not make sense." ;;
+,,t,0)

        die "No paths with -i does not make sense." ;;
 esac
 
        die "No paths with -i does not make sense." ;;
 esac
 


@@ -344,6 +352,9 @@ t,)
        ) || exit
        ;;
 ,)
        ) || exit
        ;;
 ,)

+       if test "$interactive" = t; then
+               git add --interactive || exit
+       fi

        case "$#" in
        0)
                ;; # commit as-is
        case "$#" in
        0)
                ;; # commit as-is