From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Alban Gruin <alban.gruin@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC PATCH 7/7] merge: teach --autostash option
Date: Mon, 21 Oct 2019 21:10:09 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1910212103080.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <f43c10e4818c91a8c6e9d5e0ce2a04710db3e300.1571246693.git.liu.denton@gmail.com>
Hi Denton,
On Wed, 16 Oct 2019, Denton Liu wrote:
> In rebase, one can pass the `--autostash` option to cause the worktree
> to be automatically stashed before continuing with the rebase. This
> option is missing in merge, however.
>
> Implement the `--autostash` option and corresponding `merge.autoStash`
> option in merge which stashes before merging and then pops after.
>
> Reported-by: Alban Gruin <alban.gruin@gmail.com>
Maybe "Suggested-by" would be more accurate, it is not like this feature
request was a bug report...
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> builtin/merge.c | 13 +++++++++++++
> builtin/pull.c | 9 +++++----
> t/t5520-pull.sh | 8 --------
> 3 files changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 062e911441..d1a5eaad0d 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -40,6 +40,7 @@
> #include "branch.h"
> #include "commit-reach.h"
> #include "wt-status.h"
> +#include "autostash.h"
>
> #define DEFAULT_TWOHEAD (1<<0)
> #define DEFAULT_OCTOPUS (1<<1)
> @@ -58,6 +59,8 @@ static const char * const builtin_merge_usage[] = {
> NULL
> };
>
> +static GIT_PATH_FUNC(merge_autostash, "MERGE_AUTOSTASH")
> +
> static int show_diffstat = 1, shortlog_len = -1, squash;
> static int option_commit = -1;
> static int option_edit = -1;
> @@ -81,6 +84,7 @@ static int show_progress = -1;
> static int default_to_upstream = 1;
> static int signoff;
> static const char *sign_commit;
> +static int autostash;
> static int no_verify;
>
> static struct strategy all_strategy[] = {
> @@ -285,6 +289,8 @@ static struct option builtin_merge_options[] = {
> OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
> { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
> N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
> + OPT_BOOL(0, "autostash", &autostash,
> + N_("automatically stash/stash pop before and after")),
> OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
> OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
> OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-merge-commit and commit-msg hooks")),
> @@ -440,6 +446,7 @@ static void finish(struct commit *head_commit,
> strbuf_addf(&reflog_message, "%s: %s",
> getenv("GIT_REFLOG_ACTION"), msg);
> }
> + apply_autostash(merge_autostash());
Should this not be guarded by `if (autostash)`?
> if (squash) {
> squash_message(head_commit, remoteheads);
> } else {
> @@ -631,6 +638,9 @@ static int git_merge_config(const char *k, const char *v, void *cb)
> } else if (!strcmp(k, "commit.gpgsign")) {
> sign_commit = git_config_bool(k, v) ? "" : NULL;
> return 0;
> + } else if (!strcmp(k, "merge.autostash")) {
> + autostash = git_config_bool(k, v);
> + return 0;
> }
>
> status = fmt_merge_msg_config(k, v, cb);
> @@ -724,6 +734,8 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
> for (j = common; j; j = j->next)
> commit_list_insert(j->item, &reversed);
>
> + if (autostash)
> + perform_autostash(merge_autostash());
> hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
> clean = merge_recursive(&o, head,
> remoteheads->item, reversed, &result);
> @@ -1288,6 +1300,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
>
> /* Invoke 'git reset --merge' */
> ret = cmd_reset(nargc, nargv, prefix);
> + apply_autostash(merge_autostash());
Again, this should be guarded by `if (autostash)`, methinks.
> goto done;
> }
>
> diff --git a/builtin/pull.c b/builtin/pull.c
> index d25ff13a60..ee186781ae 100644
> --- a/builtin/pull.c
> +++ b/builtin/pull.c
> @@ -183,7 +183,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")),
Makes sense; this is now shared between the rebase and the merge modes.
> OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"),
> N_("merge strategy to use"),
> 0),
> @@ -671,6 +671,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");
Or shorter:
argv_array_pushf(&args, "%s-autostash", opt_autostash ? "-" : "--no");
Ah, but that would mishandle `-1`. I bet I will be puzzled by this
again. Maybe it would make sense to mention in a code comment that it
can be `-1` in which case we leave it to `rebase` to use the config
settings to determine whether or not to autostash.
> if (opt_allow_unrelated_histories > 0)
> argv_array_push(&args, "--allow-unrelated-histories");
>
> @@ -918,9 +922,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)
> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
> index cf4cc32fd0..75f162495a 100755
> --- a/t/t5520-pull.sh
> +++ b/t/t5520-pull.sh
> @@ -365,14 +365,6 @@ 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
> -
Nice!
Dscho
> test_expect_success 'pull.rebase' '
> git reset --hard before-rebase &&
> test_config pull.rebase true &&
> --
> 2.23.0.897.g0a19638b1e
>
>
next prev parent reply other threads:[~2019-10-21 19:10 UTC|newest]
Thread overview: 152+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 17:26 [RFC PATCH 0/7] merge: learn --autostash Denton Liu
2019-10-16 17:26 ` [RFC PATCH 1/7] Makefile: alphabetically sort += lists Denton Liu
2019-10-17 18:07 ` Junio C Hamano
2019-10-21 18:44 ` Johannes Schindelin
2019-10-21 18:53 ` Denton Liu
2019-10-22 23:33 ` Johannes Schindelin
2019-10-21 19:49 ` Junio C Hamano
2019-10-21 19:54 ` Jeff King
2019-10-22 11:34 ` Junio C Hamano
2019-10-16 17:26 ` [RFC PATCH 2/7] autostash: extract read_one() from rebase Denton Liu
2019-10-18 9:04 ` Phillip Wood
2019-10-21 18:46 ` Johannes Schindelin
2019-10-16 17:26 ` [RFC PATCH 3/7] autostash: extract apply_autostash() " Denton Liu
2019-10-16 17:26 ` [RFC PATCH 4/7] autostash: extract reset_head() " Denton Liu
2019-10-18 9:37 ` Phillip Wood
2019-10-21 18:56 ` Johannes Schindelin
2019-10-16 17:26 ` [RFC PATCH 5/7] autostash: extract perform_autostash() " Denton Liu
2019-10-21 19:00 ` Johannes Schindelin
2019-10-16 17:26 ` [RFC PATCH 6/7] autostash.c: undefine USE_THE_INDEX_COMPATIBILITY_MACROS Denton Liu
2019-10-18 9:41 ` Phillip Wood
2019-10-16 17:26 ` [RFC PATCH 7/7] merge: teach --autostash option Denton Liu
2019-10-18 9:46 ` Phillip Wood
2019-12-24 9:58 ` Denton Liu
2019-10-21 19:10 ` Johannes Schindelin [this message]
2019-12-24 10:05 ` Denton Liu
2019-12-24 10:12 ` Denton Liu
2019-12-24 11:04 ` [PATCH v2 00/17] merge: learn --autostash Denton Liu
2019-12-24 11:04 ` [PATCH v2 01/17] Makefile: alphabetically sort += lists Denton Liu
2019-12-30 21:38 ` Junio C Hamano
2019-12-24 11:04 ` [PATCH v2 02/17] t7600: use test_write_lines() Denton Liu
2019-12-24 11:05 ` [PATCH v2 03/17] sequencer: use file strbuf for read_oneliner() Denton Liu
2019-12-24 11:05 ` [PATCH v2 04/17] sequencer: configurably warn on non-existent files Denton Liu
2019-12-26 20:39 ` Junio C Hamano
2019-12-24 11:05 ` [PATCH v2 05/17] sequencer: make read_oneliner() extern Denton Liu
2019-12-24 11:05 ` [PATCH v2 06/17] rebase: use read_oneliner() Denton Liu
2019-12-24 11:05 ` [PATCH v2 07/17] sequencer: make apply_rebase() accept a path Denton Liu
2019-12-24 11:05 ` [PATCH v2 08/17] rebase: use apply_autostash() from sequencer.c Denton Liu
2019-12-24 11:05 ` [PATCH v2 09/17] rebase: generify reset_head() Denton Liu
2019-12-24 11:05 ` [PATCH v2 10/17] reset: extract reset_head() from rebase Denton Liu
2019-12-24 11:05 ` [PATCH v2 11/17] rebase: extract create_autostash() Denton Liu
2019-12-24 11:05 ` [PATCH v2 12/17] rebase: generify create_autostash() Denton Liu
2019-12-24 11:05 ` [PATCH v2 13/17] sequencer: extract perform_autostash() from rebase Denton Liu
2019-12-24 11:05 ` [PATCH v2 14/17] sequencer: unlink autostash in apply_autostash() Denton Liu
2019-12-24 11:05 ` [PATCH v2 15/17] merge: teach --autostash option Denton Liu
2019-12-24 11:05 ` [PATCH v2 16/17] t5520: make test_pull_autostash() accept expect_parent_num Denton Liu
2019-12-24 11:05 ` [PATCH v2 17/17] pull: pass --autostash to merge Denton Liu
2019-12-30 21:49 ` [PATCH v2 00/17] merge: learn --autostash Junio C Hamano
2019-12-31 10:34 ` Phillip Wood
2020-01-08 6:08 ` Denton Liu
2020-01-10 14:44 ` Phillip Wood
2020-01-15 16:20 ` Denton Liu
2020-01-01 7:48 ` Denton Liu
2020-03-21 9:21 ` [PATCH v3 00/19] " Denton Liu
2020-03-21 9:21 ` [PATCH v3 01/19] Makefile: ASCII-sort += lists Denton Liu
2020-03-21 9:21 ` [PATCH v3 02/19] t7600: use test_write_lines() Denton Liu
2020-03-21 9:21 ` [PATCH v3 03/19] sequencer: use file strbuf for read_oneliner() Denton Liu
2020-04-02 13:34 ` Phillip Wood
2020-03-21 9:21 ` [PATCH v3 04/19] sequencer: make read_oneliner() accept flags Denton Liu
2020-03-21 9:21 ` [PATCH v3 05/19] sequencer: configurably warn on non-existent files Denton Liu
2020-04-02 13:39 ` Phillip Wood
2020-03-21 9:21 ` [PATCH v3 06/19] sequencer: make read_oneliner() extern Denton Liu
2020-03-21 9:21 ` [PATCH v3 07/19] rebase: use read_oneliner() Denton Liu
2020-04-02 13:41 ` Phillip Wood
2020-03-21 9:21 ` [PATCH v3 08/19] sequencer: make apply_rebase() accept a path Denton Liu
2020-03-21 9:21 ` [PATCH v3 09/19] rebase: use apply_autostash() from sequencer.c Denton Liu
2020-04-02 14:59 ` Phillip Wood
2020-03-21 9:21 ` [PATCH v3 10/19] rebase: generify reset_head() Denton Liu
2020-03-21 9:21 ` [PATCH v3 11/19] reset: extract reset_head() from rebase Denton Liu
2020-04-02 15:04 ` Phillip Wood
2020-03-21 9:21 ` [PATCH v3 12/19] rebase: extract create_autostash() Denton Liu
2020-03-21 9:21 ` [PATCH v3 13/19] rebase: generify create_autostash() Denton Liu
2020-03-21 9:21 ` [PATCH v3 14/19] sequencer: extract perform_autostash() from rebase Denton Liu
2020-03-21 9:21 ` [PATCH v3 15/19] sequencer: unlink autostash in apply_autostash() Denton Liu
2020-03-21 9:21 ` [PATCH v3 16/19] sequencer: implement save_autostash() Denton Liu
2020-04-02 15:10 ` Phillip Wood
2020-03-21 9:21 ` [PATCH v3 17/19] merge: teach --autostash option Denton Liu
2020-04-02 15:24 ` Phillip Wood
2020-04-03 10:31 ` Denton Liu
2020-04-03 10:56 ` Denton Liu
2020-04-03 13:09 ` Phillip Wood
2020-04-03 21:14 ` Denton Liu
2020-04-03 13:34 ` Phillip Wood
2020-04-03 22:25 ` Denton Liu
2020-03-21 9:21 ` [PATCH v3 18/19] t5520: make test_pull_autostash() accept expect_parent_num Denton Liu
2020-03-21 9:21 ` [PATCH v3 19/19] pull: pass --autostash to merge Denton Liu
2020-04-02 16:07 ` Phillip Wood
2020-04-04 1:11 ` [PATCH v4 00/23] merge: learn --autostash Denton Liu
2020-04-04 1:11 ` [PATCH v4 01/23] Makefile: ASCII-sort += lists Denton Liu
2020-04-04 1:11 ` [PATCH v4 02/23] t7600: use test_write_lines() Denton Liu
2020-04-04 1:11 ` [PATCH v4 03/23] sequencer: stop leaking buf Denton Liu
2020-04-05 21:33 ` Junio C Hamano
2020-04-05 21:37 ` Junio C Hamano
2020-04-05 23:42 ` Denton Liu
2020-04-04 1:11 ` [PATCH v4 04/23] sequencer: reuse strbuf_trim() in read_oneliner() Denton Liu
2020-04-05 21:46 ` Junio C Hamano
2020-04-06 1:39 ` Denton Liu
2020-04-06 14:03 ` Phillip Wood
2020-04-06 14:42 ` Phillip Wood
2020-04-07 13:56 ` Denton Liu
2020-04-04 1:11 ` [PATCH v4 05/23] sequencer: make file exists check more efficient Denton Liu
2020-04-04 1:11 ` [PATCH v4 06/23] sequencer: make read_oneliner() accept flags Denton Liu
2020-04-04 1:11 ` [PATCH v4 07/23] sequencer: configurably warn on non-existent files Denton Liu
2020-04-06 14:45 ` Phillip Wood
2020-04-04 1:11 ` [PATCH v4 08/23] sequencer: make read_oneliner() extern Denton Liu
2020-04-04 1:11 ` [PATCH v4 09/23] rebase: use read_oneliner() Denton Liu
2020-04-04 1:11 ` [PATCH v4 10/23] sequencer: make apply_rebase() accept a path Denton Liu
2020-04-06 15:07 ` Phillip Wood
2020-04-04 1:11 ` [PATCH v4 11/23] sequencer: rename stash_sha1 to stash_oid Denton Liu
2020-04-04 1:11 ` [PATCH v4 12/23] rebase: use apply_autostash() from sequencer.c Denton Liu
2020-04-04 1:11 ` [PATCH v4 13/23] rebase: generify reset_head() Denton Liu
2020-04-04 1:11 ` [PATCH v4 14/23] reset: extract reset_head() from rebase Denton Liu
2020-04-04 1:11 ` [PATCH v4 15/23] rebase: extract create_autostash() Denton Liu
2020-04-04 1:11 ` [PATCH v4 16/23] rebase: generify create_autostash() Denton Liu
2020-04-04 1:11 ` [PATCH v4 17/23] sequencer: extract perform_autostash() from rebase Denton Liu
2020-04-04 1:11 ` [PATCH v4 18/23] sequencer: unlink autostash in apply_autostash() Denton Liu
2020-04-04 1:11 ` [PATCH v4 19/23] sequencer: implement save_autostash() Denton Liu
2020-04-06 15:15 ` Phillip Wood
2020-04-04 1:11 ` [PATCH v4 20/23] sequencer: implement apply_autostash_oid() Denton Liu
2020-04-04 1:11 ` [PATCH v4 21/23] merge: teach --autostash option Denton Liu
2020-04-06 15:20 ` Phillip Wood
2020-04-07 13:09 ` Denton Liu
2020-04-07 15:06 ` Phillip Wood
2020-04-04 1:11 ` [PATCH v4 22/23] t5520: make test_pull_autostash() accept expect_parent_num Denton Liu
2020-04-04 1:11 ` [PATCH v4 23/23] pull: pass --autostash to merge Denton Liu
2020-04-07 14:27 ` [PATCH v5 00/22] merge: learn --autostash Denton Liu
2020-04-07 14:27 ` [PATCH v5 01/22] Makefile: ASCII-sort += lists Denton Liu
2020-04-07 14:27 ` [PATCH v5 02/22] t7600: use test_write_lines() Denton Liu
2020-04-07 14:27 ` [PATCH v5 03/22] sequencer: stop leaking buf Denton Liu
2020-04-07 14:27 ` [PATCH v5 04/22] sequencer: make file exists check more efficient Denton Liu
2020-04-08 0:10 ` Junio C Hamano
2020-04-07 14:27 ` [PATCH v5 05/22] sequencer: make read_oneliner() accept flags Denton Liu
2020-04-08 0:11 ` Junio C Hamano
2020-04-07 14:27 ` [PATCH v5 06/22] sequencer: configurably warn on non-existent files Denton Liu
2020-04-07 14:27 ` [PATCH v5 07/22] sequencer: make read_oneliner() extern Denton Liu
2020-04-07 14:27 ` [PATCH v5 08/22] rebase: use read_oneliner() Denton Liu
2020-04-08 0:26 ` Junio C Hamano
2020-04-07 14:27 ` [PATCH v5 09/22] sequencer: make apply_autostash() accept a path Denton Liu
2020-04-07 14:27 ` [PATCH v5 10/22] sequencer: rename stash_sha1 to stash_oid Denton Liu
2020-04-07 14:27 ` [PATCH v5 11/22] rebase: use apply_autostash() from sequencer.c Denton Liu
2020-04-07 14:27 ` [PATCH v5 12/22] rebase: generify reset_head() Denton Liu
2020-04-07 14:28 ` [PATCH v5 13/22] reset: extract reset_head() from rebase Denton Liu
2020-04-07 14:28 ` [PATCH v5 14/22] rebase: extract create_autostash() Denton Liu
2020-04-07 14:28 ` [PATCH v5 15/22] rebase: generify create_autostash() Denton Liu
2020-04-07 14:28 ` [PATCH v5 16/22] sequencer: extract perform_autostash() from rebase Denton Liu
2020-04-07 14:28 ` [PATCH v5 17/22] sequencer: unlink autostash in apply_autostash() Denton Liu
2020-04-07 14:28 ` [PATCH v5 18/22] sequencer: implement save_autostash() Denton Liu
2020-04-07 14:28 ` [PATCH v5 19/22] sequencer: implement apply_autostash_oid() Denton Liu
2020-04-07 14:28 ` [PATCH v5 20/22] merge: teach --autostash option Denton Liu
2020-04-07 14:28 ` [PATCH v5 21/22] t5520: make test_pull_autostash() accept expect_parent_num Denton Liu
2020-04-07 14:28 ` [PATCH v5 22/22] pull: pass --autostash to merge Denton Liu
2020-04-10 15:34 ` [PATCH v5 00/22] merge: learn --autostash Phillip Wood
2020-04-10 16:26 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1910212103080.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=alban.gruin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).