mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 03:06:30 +02:00
Code

pull --rebase: add --[no-]autostash flag 

If rebase.autoStash configuration variable is set, there is no way to
override it for "git pull --rebase" from the command line.

Teach "git pull --rebase" the --[no-]autostash command line flag which
overrides the current value of rebase.autoStash, if set. As "git rebase"
understands the --[no-]autostash option, it's just a matter of passing
the option to underlying "git rebase" when "git pull --rebase" is called.

Helped-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Paul Tan <pyokagan@gmail.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mehul Jain 2016-03-21 23:48:03 +05:30 committed by Junio C Hamano
parent c48d73bdec
commit f66398eb57
3 changed files with 91 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-pull.txt
View File

@ -128,6 +128,15 @@ unless you have read linkgit:git-rebase[1] carefully.
--no-rebase::
Override earlier --rebase.
--autostash::
--no-autostash::
Before starting rebase, stash local modifications away (see
linkgit:git-stash[1]) if needed, and apply the stash when
done. `--no-autostash` is useful to override the `rebase.autoStash`
configuration variable (see linkgit:git-config[1]).
+
This option is only valid when "--rebase" is used.
Options related to fetching
~~~~~~~~~~~~~~~~~~~~~~~~~~~

12
builtin/pull.c
View File

@ -86,6 +86,7 @@ static char *opt_commit;
static char *opt_edit;
static char *opt_ff;
static char *opt_verify_signatures;
static int opt_autostash = -1;
static int config_autostash;
static struct argv_array opt_strategies = ARGV_ARRAY_INIT;
static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT;
@ -150,6 +151,8 @@ static struct option pull_options[] = {
OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
N_("verify that the named commit has a valid GPG signature"),
PARSE_OPT_NOARG),
OPT_BOOL(0, "autostash", &opt_autostash,
N_("automatically stash/stash pop before and after rebase")),
OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"),
N_("merge strategy to use"),
0),
@ -802,6 +805,10 @@ static int run_rebase(const unsigned char *curr_head,
argv_array_pushv(&args, opt_strategy_opts.argv);
if (opt_gpg_sign)
argv_array_push(&args, opt_gpg_sign);
if (opt_autostash == 0)
argv_array_push(&args, "--no-autostash");
else if (opt_autostash == 1)
argv_array_push(&args, "--autostash");
argv_array_push(&args, "--onto");
argv_array_push(&args, sha1_to_hex(merge_head));
@ -847,8 +854,13 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
if (get_sha1("HEAD", orig_head))
hashclr(orig_head);
if (!opt_rebase && opt_autostash != -1)
die(_("--[no-]autostash option is only valid with --rebase."));
if (opt_rebase) {
int autostash = config_autostash;
if (opt_autostash != -1)
autostash = opt_autostash;
if (is_null_sha1(orig_head) && !is_cache_unborn())
die(_("Updating an unborn branch with changes added to the index."));

70
t/t5520-pull.sh
View File

@ -256,6 +256,76 @@ test_expect_success 'pull --rebase succeeds with dirty working directory and reb
test "$(cat file)" = "modified again"
'
test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
test_config rebase.autostash true &&
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&
git pull --rebase --autostash . copy &&
test_cmp_rev HEAD^ copy &&
test "$(cat new_file)" = dirty &&
test "$(cat file)" = "modified again"
'
test_expect_success 'pull --rebase --autostash & rebase.autoStash=false' '
test_config rebase.autostash false &&
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&
git pull --rebase --autostash . copy &&
test_cmp_rev HEAD^ copy &&
test "$(cat new_file)" = dirty &&
test "$(cat file)" = "modified again"
'
test_expect_success 'pull --rebase: --autostash & rebase.autoStash unset' '
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&
git pull --rebase --autostash . copy &&
test_cmp_rev HEAD^ copy &&
test "$(cat new_file)" = dirty &&
test "$(cat file)" = "modified again"
'
test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
test_config rebase.autostash true &&
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull --rebase --no-autostash . copy 2>err &&
test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err
'
test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
test_config rebase.autostash false &&
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull --rebase --no-autostash . copy 2>err &&
test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err
'
test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull --rebase --no-autostash . copy 2>err &&
test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err
'
test_expect_success 'pull --autostash (without --rebase) should error out' '
test_must_fail git pull --autostash . copy 2>actual &&
echo "fatal: --[no-]autostash option is only valid with --rebase." >expect &&
test_i18ncmp actual expect
'
test_expect_success 'pull --no-autostash (without --rebase) should error out' '
test_must_fail git pull --no-autostash . copy 2>actual &&
echo "fatal: --[no-]autostash option is only valid with --rebase." >expect &&
test_i18ncmp actual expect
'
test_expect_success 'pull.rebase' '
git reset --hard before-rebase &&
test_config pull.rebase true &&