[PATCH v3] add configuration variable for --autosquash option of interactive rebase
- From
Heiko Voigt <hvoigt@hvoigt.net>
- Date
- Jul 13, 2010, 11:24 UTC
- Message-ID
- <20100713112316.GA758@book.hvoigt.net>
- In-Reply-To
- <7vk4p1fdlg.fsf@alter.siamese.dyndns.org>
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> --- On Sun, Jul 11, 2010 at 10:55:55PM -0700, Junio C Hamano wrote:
Show 6 quoted lines
> Heiko Voigt <hvoigt@hvoigt.net> writes: > > > If you use this feature regularly you can now enable it by default. > > And if you use this often _but_ you sometimes need to countermand from the > command line, do you provide a way to do so (I didn't bother to check).
No I did not see the exact use case because you could simply not prefix you commits with 'fixup!' or 'squash!' and if your project regularly uses those on commits you probably would like to configure different prefixes.
On the other hand I think it is a good convention to always provide a --no-... option for things you can enable in the config and it does not hurt to do so. So here is a new patch implementing this. I also fixed some places with missing && in the testcases I implemented.
cheers Heiko
Documentation/git-rebase.txt | 8 ++++++++ git-rebase--interactive.sh | 4 ++++ t/t3415-rebase-autosquash.sh | 40 ++++++++++++++++++++++++++++++++-------- 3 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index be23ad2..d357ab1 100644 --- 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. +rebase.autosquash:: + If set to true enable '--autosquash' option by default. + OPTIONS ------- <newbase>:: @@ -335,6 +338,11 @@ idea unless you know what you are doing (see BUGS below). + This option is only valid when the '--interactive' option is used. +--no-autosquash:: + 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 fast-forwarding over the unchanged ones. This ensures that the diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 6b86abc..7b35f80 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -111,6 +111,7 @@ VERBOSE= 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, @@ -795,6 +796,9 @@ first and then run 'git rebase --continue' again." --autosquash) AUTOSQUASH=t ;; + --no-autosquash) + AUTOSQUASH= + ;; --onto) shift ONTO=$(parse_onto "$1") || diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index b63f4e2..37cb89a 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -21,38 +21,62 @@ test_expect_success setup ' 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 tag final-fixup && + git tag $1 && test_tick && - git rebase --autosquash -i HEAD^^^ && + git rebase $2 -i HEAD^^^ && 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_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 tag final-squash && + git tag $1 && test_tick && - git rebase --autosquash -i HEAD^^^ && + git rebase $2 -i HEAD^^^ && 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_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' '
-- 1.7.2.rc2.1.gf1735.dirty