diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:59 -0700 |
| commit | c757aa2d12ceeb5a86c2da8ad1e9e752625af739 (patch) | |
| tree | 9adebc7b9fe47fde483eb4d1734c83dc355ccdc7 | |
| parent | Merge branch 'jk/diff-rendered-docs' (diff) | |
| parent | pull --rebase=<type>: allow single-letter abbreviations for the type (diff) | |
| download | tgif-c757aa2d12ceeb5a86c2da8ad1e9e752625af739.tar.xz | |
Merge branch 'js/pull-rebase-type-shorthand'
"git pull --rebase=interactive" learned "i" as a short-hand for
"interactive".
* js/pull-rebase-type-shorthand:
pull --rebase=<type>: allow single-letter abbreviations for the type
| -rw-r--r-- | builtin/pull.c | 6 | ||||
| -rwxr-xr-x | t/t5520-pull.sh | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 4e78935392..53bc5facfd 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -48,11 +48,11 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value, return REBASE_FALSE; else if (v > 0) return REBASE_TRUE; - else if (!strcmp(value, "preserve")) + else if (!strcmp(value, "preserve") || !strcmp(value, "p")) return REBASE_PRESERVE; - else if (!strcmp(value, "merges")) + else if (!strcmp(value, "merges") || !strcmp(value, "m")) return REBASE_MERGES; - else if (!strcmp(value, "interactive")) + else if (!strcmp(value, "interactive") || !strcmp(value, "i")) return REBASE_INTERACTIVE; if (fatal) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 68aa5f0340..5e501c8b08 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -475,10 +475,22 @@ test_expect_success 'pull.rebase=interactive' ' false EOF test_set_editor "$TRASH_DIRECTORY/fake-editor" && + test_when_finished "test_might_fail git rebase --abort" && test_must_fail git pull --rebase=interactive . copy && test "I was here" = "$(cat fake.out)" ' +test_expect_success 'pull --rebase=i' ' + write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF && + echo I was here, too >fake.out && + false + EOF + test_set_editor "$TRASH_DIRECTORY/fake-editor" && + test_when_finished "test_might_fail git rebase --abort" && + test_must_fail git pull --rebase=i . copy && + test "I was here, too" = "$(cat fake.out)" +' + test_expect_success 'pull.rebase=invalid fails' ' git reset --hard before-preserve-rebase && test_config pull.rebase invalid && |