add configuration variable for --autosquash option of interactive rebase

If you use this feature regularly you can now enable it by default. In
case the user wants to override this config on the commandline
--no-autosquash can be used to force disabling.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 79d54e546a7823eb7b9da2a1fc99961a26123f63..9e3c48bd8c59723bdd7bf43ce9a9c8d6cf63bbe0 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1533,6 +1533,9 @@ rebase.stat::
        Whether to show a diffstat of what changed upstream since the last
        rebase. False by default.
 
        Whether to show a diffstat of what changed upstream since the last
        rebase. False by default.
 

+rebase.autosquash::
+       If set to true enable '--autosquash' option by default.
+

 receive.autogc::
        By default, git-receive-pack will run "git-gc --auto" after
        receiving data from git-push and updating refs.  You can stop
 receive.autogc::
        By default, git-receive-pack will run "git-gc --auto" after
        receiving data from git-push and updating refs.  You can stop

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index be23ad2359b486e4da2ef85962d73cdfed7097fe..911b1380f30d0f39eb6bd2250427791195bd3e32 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -199,6 +199,9 @@ rebase.stat::
        Whether to show a diffstat of what changed upstream since the last
        rebase. False by default.
 
        Whether to show a diffstat of what changed upstream since the last
        rebase. False by default.
 

+rebase.autosquash::
+       If set to true enable '--autosquash' option by default.
+

 OPTIONS
 -------
 <newbase>::
 OPTIONS
 -------
 <newbase>::


@@ -326,6 +329,7 @@ idea unless you know what you are doing (see BUGS below).
        instead.
 
 --autosquash::
        instead.
 
 --autosquash::

+--no-autosquash::

        When the commit log message begins with "squash! ..." (or
        "fixup! ..."), and there is a commit whose title begins with
        the same ..., automatically modify the todo list of rebase -i
        When the commit log message begins with "squash! ..." (or
        "fixup! ..."), and there is a commit whose title begins with
        the same ..., automatically modify the todo list of rebase -i


@@ -334,6 +338,10 @@ idea unless you know what you are doing (see BUGS below).
        commit from `pick` to `squash` (or `fixup`).
 +
 This option is only valid when the '--interactive' option is used.
        commit from `pick` to `squash` (or `fixup`).
 +
 This option is only valid when the '--interactive' option is used.

++
+If the '--autosquash' option is enabled by default using the
+configuration variable `rebase.autosquash`, this option can be
+used to override and disable this setting.

 
 --no-ff::
        With --interactive, cherry-pick all rebased commits instead of
 
 --no-ff::
        With --interactive, cherry-pick all rebased commits instead of

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 6b86abc64bfe0034caf23cf9530955128766de32..7b35f80818018a5b53f779541c27d85afd73dd00 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -111,6 +111,7 @@ VERBOSE=
 OK_TO_SKIP_PRE_REBASE=
 REBASE_ROOT=
 AUTOSQUASH=
 OK_TO_SKIP_PRE_REBASE=
 REBASE_ROOT=
 AUTOSQUASH=

+test "$(git config --bool rebase.autosquash)" = "true" && AUTOSQUASH=t

 NEVER_FF=
 
 GIT_CHERRY_PICK_HELP="  After resolving the conflicts,
 NEVER_FF=
 
 GIT_CHERRY_PICK_HELP="  After resolving the conflicts,


@@ -795,6 +796,9 @@ first and then run 'git rebase --continue' again."
        --autosquash)
                AUTOSQUASH=t
                ;;
        --autosquash)
                AUTOSQUASH=t
                ;;

+       --no-autosquash)
+               AUTOSQUASH=
+               ;;

        --onto)
                shift
                ONTO=$(parse_onto "$1") ||
        --onto)
                shift
                ONTO=$(parse_onto "$1") ||

diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index b63f4e2d677b6b4827d39a51a3c39719a8ab5b4f..37cb89ab53055099db3d5f774d00ade1c4da6c69 100755 (executable)
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -21,38 +21,62 @@ test_expect_success setup '
        git tag base
 '
 
        git tag base
 '
 

-test_expect_success 'auto fixup' '
+test_auto_fixup() {

        git reset --hard base &&
        echo 1 >file1 &&
        git add -u &&
        test_tick &&
        git commit -m "fixup! first"
 
        git reset --hard base &&
        echo 1 >file1 &&
        git add -u &&
        test_tick &&
        git commit -m "fixup! first"
 

-       git tag final-fixup &&
+       git tag $1 &&

        test_tick &&
        test_tick &&

-       git rebase --autosquash -i HEAD^^^ &&
+       git rebase $2 -i HEAD^^^ &&

        git log --oneline >actual &&
        test 3 = $(wc -l <actual) &&
        git log --oneline >actual &&
        test 3 = $(wc -l <actual) &&

-       git diff --exit-code final-fixup &&
+       git diff --exit-code $1 &&

        test 1 = "$(git cat-file blob HEAD^:file1)" &&
        test 1 = $(git cat-file commit HEAD^ | grep first | wc -l)
        test 1 = "$(git cat-file blob HEAD^:file1)" &&
        test 1 = $(git cat-file commit HEAD^ | grep first | wc -l)

+}
+
+test_expect_success 'auto fixup (option)' '
+       test_auto_fixup final-fixup-option --autosquash
+'
+
+test_expect_success 'auto fixup (config)' '
+       git config rebase.autosquash true &&
+       test_auto_fixup final-fixup-config-true &&
+       test_must_fail test_auto_fixup fixup-config-true-no --no-autosquash &&
+       git config rebase.autosquash false &&
+       test_must_fail test_auto_fixup final-fixup-config-false

 '
 
 '
 

-test_expect_success 'auto squash' '
+test_auto_squash() {

        git reset --hard base &&
        echo 1 >file1 &&
        git add -u &&
        test_tick &&
        git commit -m "squash! first"
 
        git reset --hard base &&
        echo 1 >file1 &&
        git add -u &&
        test_tick &&
        git commit -m "squash! first"
 

-       git tag final-squash &&
+       git tag $1 &&

        test_tick &&
        test_tick &&

-       git rebase --autosquash -i HEAD^^^ &&
+       git rebase $2 -i HEAD^^^ &&

        git log --oneline >actual &&
        test 3 = $(wc -l <actual) &&
        git log --oneline >actual &&
        test 3 = $(wc -l <actual) &&

-       git diff --exit-code final-squash &&
+       git diff --exit-code $1 &&

        test 1 = "$(git cat-file blob HEAD^:file1)" &&
        test 2 = $(git cat-file commit HEAD^ | grep first | wc -l)
        test 1 = "$(git cat-file blob HEAD^:file1)" &&
        test 2 = $(git cat-file commit HEAD^ | grep first | wc -l)

+}
+
+test_expect_success 'auto squash (option)' '
+       test_auto_squash final-squash --autosquash
+'
+
+test_expect_success 'auto squash (config)' '
+       git config rebase.autosquash true &&
+       test_auto_squash final-squash-config-true &&
+       test_must_fail test_auto_squash squash-config-true-no --no-autosquash &&
+       git config rebase.autosquash false &&
+       test_must_fail test_auto_squash final-squash-config-false

 '
 
 test_expect_success 'misspelled auto squash' '
 '
 
 test_expect_success 'misspelled auto squash' '