mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
pull: pass --autostash to merge
Before, `--autostash` only worked with `git pull --rebase`. However, in the last patch, merge learned `--autostash` as well so there's no reason why we should have this restriction anymore. Teach pull to pass `--autostash` to merge, just like it did for rebase. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f8a1785807
commit
d9f15d37f1
|
@ -133,15 +133,6 @@ 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 entry 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
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
|
|
|
@ -155,6 +155,8 @@ ifndef::git-pull[]
|
|||
Note that not all merge strategies may support progress
|
||||
reporting.
|
||||
|
||||
endif::git-pull[]
|
||||
|
||||
--autostash::
|
||||
--no-autostash::
|
||||
Automatically create a temporary stash entry before the operation
|
||||
|
@ -163,8 +165,6 @@ ifndef::git-pull[]
|
|||
with care: the final stash application after a successful
|
||||
merge might result in non-trivial conflicts.
|
||||
|
||||
endif::git-pull[]
|
||||
|
||||
--allow-unrelated-histories::
|
||||
By default, `git merge` command refuses to merge histories
|
||||
that do not share a common ancestor. This option can be
|
||||
|
|
|
@ -163,7 +163,7 @@ static struct option pull_options[] = {
|
|||
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")),
|
||||
N_("automatically stash/stash pop before and after")),
|
||||
OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"),
|
||||
N_("merge strategy to use"),
|
||||
0),
|
||||
|
@ -661,6 +661,10 @@ static int run_merge(void)
|
|||
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");
|
||||
if (opt_allow_unrelated_histories > 0)
|
||||
argv_array_push(&args, "--allow-unrelated-histories");
|
||||
|
||||
|
@ -908,9 +912,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
|
|||
if (get_oid("HEAD", &orig_head))
|
||||
oidclr(&orig_head);
|
||||
|
||||
if (!opt_rebase && opt_autostash != -1)
|
||||
die(_("--[no-]autostash option is only valid with --rebase."));
|
||||
|
||||
autostash = config_autostash;
|
||||
if (opt_rebase) {
|
||||
if (opt_autostash != -1)
|
||||
|
|
|
@ -28,7 +28,7 @@ test_pull_autostash_fail () {
|
|||
echo dirty >new_file &&
|
||||
git add new_file &&
|
||||
test_must_fail git pull "$@" . copy 2>err &&
|
||||
test_i18ngrep "uncommitted changes." err
|
||||
test_i18ngrep "\(uncommitted changes.\)\|\(overwritten by merge:\)" err
|
||||
}
|
||||
|
||||
test_expect_success setup '
|
||||
|
@ -404,13 +404,40 @@ test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
|
|||
test_pull_autostash_fail --rebase --no-autostash
|
||||
'
|
||||
|
||||
for i in --autostash --no-autostash
|
||||
do
|
||||
test_expect_success "pull $i (without --rebase) is illegal" '
|
||||
test_must_fail git pull $i . copy 2>err &&
|
||||
test_i18ngrep "only valid with --rebase" err
|
||||
'
|
||||
done
|
||||
test_expect_success 'pull succeeds with dirty working directory and merge.autostash set' '
|
||||
test_config merge.autostash true &&
|
||||
test_pull_autostash 2
|
||||
'
|
||||
|
||||
test_expect_success 'pull --autostash & merge.autostash=true' '
|
||||
test_config merge.autostash true &&
|
||||
test_pull_autostash 2 --autostash
|
||||
'
|
||||
|
||||
test_expect_success 'pull --autostash & merge.autostash=false' '
|
||||
test_config merge.autostash false &&
|
||||
test_pull_autostash 2 --autostash
|
||||
'
|
||||
|
||||
test_expect_success 'pull --autostash & merge.autostash unset' '
|
||||
test_unconfig merge.autostash &&
|
||||
test_pull_autostash 2 --autostash
|
||||
'
|
||||
|
||||
test_expect_success 'pull --no-autostash & merge.autostash=true' '
|
||||
test_config merge.autostash true &&
|
||||
test_pull_autostash_fail --no-autostash
|
||||
'
|
||||
|
||||
test_expect_success 'pull --no-autostash & merge.autostash=false' '
|
||||
test_config merge.autostash false &&
|
||||
test_pull_autostash_fail --no-autostash
|
||||
'
|
||||
|
||||
test_expect_success 'pull --no-autostash & merge.autostash unset' '
|
||||
test_unconfig merge.autostash &&
|
||||
test_pull_autostash_fail --no-autostash
|
||||
'
|
||||
|
||||
test_expect_success 'pull.rebase' '
|
||||
git reset --hard before-rebase &&
|
||||
|
|
Loading…
Reference in a new issue