From: Phillip Wood <phillip.wood123@gmail.com>
To: Denton Liu <liu.denton@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Cc: Alban Gruin <alban.gruin@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC PATCH 4/7] autostash: extract reset_head() from rebase
Date: Fri, 18 Oct 2019 10:37:01 +0100 [thread overview]
Message-ID: <ab064a01-eed3-f90b-df47-1f372a063e30@gmail.com> (raw)
In-Reply-To: <5e0dcd7cbeb3481beef04f1d145474739f8bdea3.1571246693.git.liu.denton@gmail.com>
Hi Denton
It's great to see this being libified, I've had it in mind to do this so
we can avoid forking 'git checkout' in sequencer.c
On 16/10/2019 18:26, Denton Liu wrote:
> Begin the process of lib-ifying the autostash code. In a future commit,
>
> This patch is best viewed with `--color-moved` and
> `--color-moved-ws=allow-indentation-change`.
> this will be used to implement `--autostash` in other builtins.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> autostash.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++
> autostash.h | 12 +++++
> builtin/rebase.c | 137 -----------------------------------------------
> 3 files changed, 149 insertions(+), 137 deletions(-)
>
> diff --git a/autostash.c b/autostash.c
> index 62ec7a7c80..eb58e0c8a4 100644
> --- a/autostash.c
> +++ b/autostash.c
> @@ -1,9 +1,17 @@
> +#define USE_THE_INDEX_COMPATIBILITY_MACROS
It might be nicer to have a preparatory step that fixes this by adding a
'struct repository *r' argument to the function in builtin/rebase.c
before moving the function. You could also do the same for next patch
and then move both functions together.
Best Wishes
Phillip
> +
> #include "git-compat-util.h"
> #include "autostash.h"
> +#include "cache-tree.h"
> #include "dir.h"
> #include "gettext.h"
> +#include "lockfile.h"
> +#include "refs.h"
> #include "run-command.h"
> #include "strbuf.h"
> +#include "tree-walk.h"
> +#include "tree.h"
> +#include "unpack-trees.h"
>
> int read_one(const char *path, struct strbuf *buf)
> {
> @@ -13,6 +21,135 @@ int read_one(const char *path, struct strbuf *buf)
> return 0;
> }
>
> +int reset_head(struct object_id *oid, const char *action,
> + const char *switch_to_branch, unsigned flags,
> + const char *reflog_orig_head, const char *reflog_head)
> +{
> + unsigned detach_head = flags & RESET_HEAD_DETACH;
> + unsigned reset_hard = flags & RESET_HEAD_HARD;
> + unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
> + unsigned refs_only = flags & RESET_HEAD_REFS_ONLY;
> + unsigned update_orig_head = flags & RESET_ORIG_HEAD;
> + struct object_id head_oid;
> + struct tree_desc desc[2] = { { NULL }, { NULL } };
> + struct lock_file lock = LOCK_INIT;
> + struct unpack_trees_options unpack_tree_opts;
> + struct tree *tree;
> + const char *reflog_action;
> + struct strbuf msg = STRBUF_INIT;
> + size_t prefix_len;
> + struct object_id *orig = NULL, oid_orig,
> + *old_orig = NULL, oid_old_orig;
> + int ret = 0, nr = 0;
> +
> + if (switch_to_branch && !starts_with(switch_to_branch, "refs/"))
> + BUG("Not a fully qualified branch: '%s'", switch_to_branch);
> +
> + if (!refs_only && hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) {
> + ret = -1;
> + goto leave_reset_head;
> + }
> +
> + if ((!oid || !reset_hard) && get_oid("HEAD", &head_oid)) {
> + ret = error(_("could not determine HEAD revision"));
> + goto leave_reset_head;
> + }
> +
> + if (!oid)
> + oid = &head_oid;
> +
> + if (refs_only)
> + goto reset_head_refs;
> +
> + memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));
> + setup_unpack_trees_porcelain(&unpack_tree_opts, action);
> + unpack_tree_opts.head_idx = 1;
> + unpack_tree_opts.src_index = the_repository->index;
> + unpack_tree_opts.dst_index = the_repository->index;
> + unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
> + unpack_tree_opts.update = 1;
> + unpack_tree_opts.merge = 1;
> + if (!detach_head)
> + unpack_tree_opts.reset = 1;
> +
> + if (repo_read_index_unmerged(the_repository) < 0) {
> + ret = error(_("could not read index"));
> + goto leave_reset_head;
> + }
> +
> + if (!reset_hard && !fill_tree_descriptor(the_repository, &desc[nr++], &head_oid)) {
> + ret = error(_("failed to find tree of %s"),
> + oid_to_hex(&head_oid));
> + goto leave_reset_head;
> + }
> +
> + if (!fill_tree_descriptor(the_repository, &desc[nr++], oid)) {
> + ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
> + goto leave_reset_head;
> + }
> +
> + if (unpack_trees(nr, desc, &unpack_tree_opts)) {
> + ret = -1;
> + goto leave_reset_head;
> + }
> +
> + tree = parse_tree_indirect(oid);
> + prime_cache_tree(the_repository, the_repository->index, tree);
> +
> + if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) {
> + ret = error(_("could not write index"));
> + goto leave_reset_head;
> + }
> +
> +reset_head_refs:
> + reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
> + strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase");
> + prefix_len = msg.len;
> +
> + if (update_orig_head) {
> + if (!get_oid("ORIG_HEAD", &oid_old_orig))
> + old_orig = &oid_old_orig;
> + if (!get_oid("HEAD", &oid_orig)) {
> + orig = &oid_orig;
> + if (!reflog_orig_head) {
> + strbuf_addstr(&msg, "updating ORIG_HEAD");
> + reflog_orig_head = msg.buf;
> + }
> + update_ref(reflog_orig_head, "ORIG_HEAD", orig,
> + old_orig, 0, UPDATE_REFS_MSG_ON_ERR);
> + } else if (old_orig)
> + delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
> + }
> +
> + if (!reflog_head) {
> + strbuf_setlen(&msg, prefix_len);
> + strbuf_addstr(&msg, "updating HEAD");
> + reflog_head = msg.buf;
> + }
> + if (!switch_to_branch)
> + ret = update_ref(reflog_head, "HEAD", oid, orig,
> + detach_head ? REF_NO_DEREF : 0,
> + UPDATE_REFS_MSG_ON_ERR);
> + else {
> + ret = update_ref(reflog_head, switch_to_branch, oid,
> + NULL, 0, UPDATE_REFS_MSG_ON_ERR);
> + if (!ret)
> + ret = create_symref("HEAD", switch_to_branch,
> + reflog_head);
> + }
> + if (run_hook)
> + run_hook_le(NULL, "post-checkout",
> + oid_to_hex(orig ? orig : &null_oid),
> + oid_to_hex(oid), "1", NULL);
> +
> +leave_reset_head:
> + strbuf_release(&msg);
> + rollback_lock_file(&lock);
> + while (nr)
> + free((void *)desc[--nr].buffer);
> + return ret;
> +}
> +
> int apply_autostash(const char *path)
> {
> struct strbuf autostash = STRBUF_INIT;
> diff --git a/autostash.h b/autostash.h
> index 5f4e4bd22c..1406638166 100644
> --- a/autostash.h
> +++ b/autostash.h
> @@ -6,6 +6,18 @@
> /* Read one file, then strip line endings */
> int read_one(const char *path, struct strbuf *buf);
>
> +#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
> +
> +#define RESET_HEAD_DETACH (1<<0)
> +#define RESET_HEAD_HARD (1<<1)
> +#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
> +#define RESET_HEAD_REFS_ONLY (1<<3)
> +#define RESET_ORIG_HEAD (1<<4)
> +
> +int reset_head(struct object_id *oid, const char *action,
> + const char *switch_to_branch, unsigned flags,
> + const char *reflog_orig_head, const char *reflog_head);
> +
> int apply_autostash(const char *path);
>
> #endif
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 661928d427..c3165896cc 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -734,143 +734,6 @@ static void add_var(struct strbuf *buf, const char *name, const char *value)
> }
> }
>
> -#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
> -
> -#define RESET_HEAD_DETACH (1<<0)
> -#define RESET_HEAD_HARD (1<<1)
> -#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
> -#define RESET_HEAD_REFS_ONLY (1<<3)
> -#define RESET_ORIG_HEAD (1<<4)
> -
> -static int reset_head(struct object_id *oid, const char *action,
> - const char *switch_to_branch, unsigned flags,
> - const char *reflog_orig_head, const char *reflog_head)
> -{
> - unsigned detach_head = flags & RESET_HEAD_DETACH;
> - unsigned reset_hard = flags & RESET_HEAD_HARD;
> - unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
> - unsigned refs_only = flags & RESET_HEAD_REFS_ONLY;
> - unsigned update_orig_head = flags & RESET_ORIG_HEAD;
> - struct object_id head_oid;
> - struct tree_desc desc[2] = { { NULL }, { NULL } };
> - struct lock_file lock = LOCK_INIT;
> - struct unpack_trees_options unpack_tree_opts;
> - struct tree *tree;
> - const char *reflog_action;
> - struct strbuf msg = STRBUF_INIT;
> - size_t prefix_len;
> - struct object_id *orig = NULL, oid_orig,
> - *old_orig = NULL, oid_old_orig;
> - int ret = 0, nr = 0;
> -
> - if (switch_to_branch && !starts_with(switch_to_branch, "refs/"))
> - BUG("Not a fully qualified branch: '%s'", switch_to_branch);
> -
> - if (!refs_only && hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) {
> - ret = -1;
> - goto leave_reset_head;
> - }
> -
> - if ((!oid || !reset_hard) && get_oid("HEAD", &head_oid)) {
> - ret = error(_("could not determine HEAD revision"));
> - goto leave_reset_head;
> - }
> -
> - if (!oid)
> - oid = &head_oid;
> -
> - if (refs_only)
> - goto reset_head_refs;
> -
> - memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));
> - setup_unpack_trees_porcelain(&unpack_tree_opts, action);
> - unpack_tree_opts.head_idx = 1;
> - unpack_tree_opts.src_index = the_repository->index;
> - unpack_tree_opts.dst_index = the_repository->index;
> - unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
> - unpack_tree_opts.update = 1;
> - unpack_tree_opts.merge = 1;
> - if (!detach_head)
> - unpack_tree_opts.reset = 1;
> -
> - if (repo_read_index_unmerged(the_repository) < 0) {
> - ret = error(_("could not read index"));
> - goto leave_reset_head;
> - }
> -
> - if (!reset_hard && !fill_tree_descriptor(the_repository, &desc[nr++], &head_oid)) {
> - ret = error(_("failed to find tree of %s"),
> - oid_to_hex(&head_oid));
> - goto leave_reset_head;
> - }
> -
> - if (!fill_tree_descriptor(the_repository, &desc[nr++], oid)) {
> - ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
> - goto leave_reset_head;
> - }
> -
> - if (unpack_trees(nr, desc, &unpack_tree_opts)) {
> - ret = -1;
> - goto leave_reset_head;
> - }
> -
> - tree = parse_tree_indirect(oid);
> - prime_cache_tree(the_repository, the_repository->index, tree);
> -
> - if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) {
> - ret = error(_("could not write index"));
> - goto leave_reset_head;
> - }
> -
> -reset_head_refs:
> - reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
> - strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase");
> - prefix_len = msg.len;
> -
> - if (update_orig_head) {
> - if (!get_oid("ORIG_HEAD", &oid_old_orig))
> - old_orig = &oid_old_orig;
> - if (!get_oid("HEAD", &oid_orig)) {
> - orig = &oid_orig;
> - if (!reflog_orig_head) {
> - strbuf_addstr(&msg, "updating ORIG_HEAD");
> - reflog_orig_head = msg.buf;
> - }
> - update_ref(reflog_orig_head, "ORIG_HEAD", orig,
> - old_orig, 0, UPDATE_REFS_MSG_ON_ERR);
> - } else if (old_orig)
> - delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
> - }
> -
> - if (!reflog_head) {
> - strbuf_setlen(&msg, prefix_len);
> - strbuf_addstr(&msg, "updating HEAD");
> - reflog_head = msg.buf;
> - }
> - if (!switch_to_branch)
> - ret = update_ref(reflog_head, "HEAD", oid, orig,
> - detach_head ? REF_NO_DEREF : 0,
> - UPDATE_REFS_MSG_ON_ERR);
> - else {
> - ret = update_ref(reflog_head, switch_to_branch, oid,
> - NULL, 0, UPDATE_REFS_MSG_ON_ERR);
> - if (!ret)
> - ret = create_symref("HEAD", switch_to_branch,
> - reflog_head);
> - }
> - if (run_hook)
> - run_hook_le(NULL, "post-checkout",
> - oid_to_hex(orig ? orig : &null_oid),
> - oid_to_hex(oid), "1", NULL);
> -
> -leave_reset_head:
> - strbuf_release(&msg);
> - rollback_lock_file(&lock);
> - while (nr)
> - free((void *)desc[--nr].buffer);
> - return ret;
> -}
> -
> static int move_to_original_branch(struct rebase_options *opts)
> {
> struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
>
next prev parent reply other threads:[~2019-10-18 9:37 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 [this message]
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
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=ab064a01-eed3-f90b-df47-1f372a063e30@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=alban.gruin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=liu.denton@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).