development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase: support --autosquash without -i

Browse source 
The rebase --autosquash option is quietly ignored when used without
--interactive (apart from preventing preemptive fast-forwarding and
triggering conflicts with apply backend options).

Change that to support --autosquash without --interactive, by dropping
its restriction to REBASE_INTERACTIVE_EXCPLICIT mode. When used this
way, auto-squashing is done without opening the todo list editor.

Drop the -i requirement from the --autosquash description, and amend
t3415-rebase-autosquash.sh to test the option and the rebase.autoSquash
config variable with and without -i.

Signed-off-by: Andy Koppe <andy.koppe@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andy Koppe 2023-11-14 21:43:38 +00:00 committed by Junio C Hamano
parent 75cf39b117
commit 297be59456
3 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/git-rebase.txt
View file

@ -592,7 +592,7 @@ See also INCOMPATIBLE OPTIONS below.
When the commit log message begins with "squash! ..." or "fixup! ..."
or "amend! ...", and there is already a commit in the todo list that
matches the same `...`, automatically modify the todo list of
`rebase -i`, so that the commit marked for squashing comes right after
`rebase`, so that the commit marked for squashing comes right after
the commit to be modified, and change the action of the moved commit
from `pick` to `squash` or `fixup` or `fixup -C` respectively. A commit
matches the `...` if the commit subject matches, or if the `...` refers

4
builtin/rebase.c
View file

@ -710,10 +710,8 @@ static int run_specific_rebase(struct rebase_options *opts)
if (opts->type == REBASE_MERGE) {
/* Run sequencer-based rebase */
setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1);
if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT))
setenv("GIT_SEQUENCE_EDITOR", ":", 1);
opts->autosquash = 0;
}
if (opts->gpg_sign_opt) {
/* remove the leading "-S" */
char *tmp = xstrdup(opts->gpg_sign_opt + 2);

38
t/t3415-rebase-autosquash.sh
View file

@ -43,7 +43,7 @@ test_auto_fixup () {
git tag $1 &&
test_tick &&
git rebase $2 -i HEAD^^^ &&
git rebase $2 HEAD^^^ &&
git log --oneline >actual &&
if test -n "$no_squash"
then
@ -61,15 +61,24 @@ test_auto_fixup () {
}
test_expect_success 'auto fixup (option)' '
test_auto_fixup final-fixup-option --autosquash
test_auto_fixup fixup-option --autosquash &&
test_auto_fixup fixup-option-i "--autosquash -i"
'
test_expect_success 'auto fixup (config)' '
test_expect_success 'auto fixup (config true)' '
git config rebase.autosquash true &&
test_auto_fixup final-fixup-config-true &&
test_auto_fixup ! fixup-config-true &&
test_auto_fixup fixup-config-true-i -i &&
test_auto_fixup ! fixup-config-true-no --no-autosquash &&
test_auto_fixup ! fixup-config-true-i-no "-i --no-autosquash"
'
test_expect_success 'auto fixup (config false)' '
git config rebase.autosquash false &&
test_auto_fixup ! final-fixup-config-false
test_auto_fixup ! fixup-config-false &&
test_auto_fixup ! fixup-config-false-i -i &&
test_auto_fixup fixup-config-false-yes --autosquash &&
test_auto_fixup fixup-config-false-i-yes "-i --autosquash"
'
test_auto_squash () {
@ -87,7 +96,7 @@ test_auto_squash () {
git commit -m "squash! first" -m "extra para for first" &&
git tag $1 &&
test_tick &&
git rebase $2 -i HEAD^^^ &&
git rebase $2 HEAD^^^ &&
git log --oneline >actual &&
if test -n "$no_squash"
then
@ -105,15 +114,24 @@ test_auto_squash () {
}
test_expect_success 'auto squash (option)' '
test_auto_squash final-squash --autosquash
test_auto_squash squash-option --autosquash &&
test_auto_squash squash-option-i "--autosquash -i"
'
test_expect_success 'auto squash (config)' '
test_expect_success 'auto squash (config true)' '
git config rebase.autosquash true &&
test_auto_squash final-squash-config-true &&
test_auto_squash ! squash-config-true &&
test_auto_squash squash-config-true-i -i &&
test_auto_squash ! squash-config-true-no --no-autosquash &&
test_auto_squash ! squash-config-true-i-no "-i --no-autosquash"
'
test_expect_success 'auto squash (config false)' '
git config rebase.autosquash false &&
test_auto_squash ! final-squash-config-false
test_auto_squash ! squash-config-false &&
test_auto_squash ! squash-config-false-i -i &&
test_auto_squash squash-config-false-yes --autosquash &&
test_auto_squash squash-config-false-i-yes "-i --autosquash"
'
test_expect_success 'misspelled auto squash' '