mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 04:23:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/pull-rebase-type-shorthand'

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2018-08-17 13:09:59 -07:00
commit c757aa2d12
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/pull.c
View File

@ -48,11 +48,11 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value,
return REBASE_FALSE; return REBASE_FALSE;
else if (v > 0) else if (v > 0)
return REBASE_TRUE; return REBASE_TRUE;
else if (!strcmp(value, "preserve")) else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
return REBASE_PRESERVE; return REBASE_PRESERVE;
else if (!strcmp(value, "merges")) else if (!strcmp(value, "merges") || !strcmp(value, "m"))
return REBASE_MERGES; return REBASE_MERGES;
else if (!strcmp(value, "interactive")) else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
return REBASE_INTERACTIVE; return REBASE_INTERACTIVE;
if (fatal) if (fatal)

12
t/t5520-pull.sh
View File

@ -475,10 +475,22 @@ test_expect_success 'pull.rebase=interactive' '
false false
EOF EOF
test_set_editor "$TRASH_DIRECTORY/fake-editor" && 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_must_fail git pull --rebase=interactive . copy &&
test "I was here" = "$(cat fake.out)" 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' ' test_expect_success 'pull.rebase=invalid fails' '
git reset --hard before-preserve-rebase && git reset --hard before-preserve-rebase &&
test_config pull.rebase invalid && test_config pull.rebase invalid &&