git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v5 00/22] merge: learn --autostash

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Apr 10, 2020, 15:34 UTC
Message-ID
<eaf864e6-8441-c5a6-3c15-b71c522ec43d@gmail.com>
In-Reply-To
<cover.1586269542.git.liu.denton@gmail.com>
Hi Denton
On 07/04/2020 15:27, Denton Liu wrote:
 > [...]
Show 16 quoted lines
> Chagnes since v4:
> 
> * Drop 'sequencer: reuse strbuf_trim() in read_oneliner()'
> 
> * Fix commit message in 'sequencer: make apply_autostash() accept a path'
> 
> * Add more detail in commit message 'sequencer: implement save_autostash()'
> 
> * In 'merge: teach --autostash option', improve documentation, remove
>    builtin/reset.c changes, add a `git merge --quit` test case
> [...]
> Range-diff against v4:
>   1:  c26771e934 =  1:  c26771e934 Makefile: ASCII-sort += lists
>   2:  059e0e8e43 =  2:  059e0e8e43 t7600: use test_write_lines()
>   3:  76585e5b13 =  3:  76585e5b13 sequencer: stop leaking buf
>   4:  c7a3cfa200 <  -:  ---------- sequencer: reuse strbuf_trim() in read_oneliner()

I think it makes sense to drop that one, it was more trouble than it was worth in the end

Show 218 quoted lines
>   5:  58da8e9555 !  4:  dc4674d222 sequencer: make file exists check more efficient
>      @@ Commit message
>           check `errno` to see if the file doesn't exist.
>       
>        ## sequencer.c ##
>      -@@ sequencer.c: static int write_message(const void *buf, size_t len, const char *filename,
>      - static int read_oneliner(struct strbuf *buf,
>      - 	const char *path, int skip_if_empty)
>      +@@ sequencer.c: static int read_oneliner(struct strbuf *buf,
>        {
>      --
>      + 	int orig_len = buf->len;
>      +
>       -	if (!file_exists(path))
>       -		return 0;
>       -
>      - 	strbuf_reset(buf);
>        	if (strbuf_read_file(buf, path, 0) < 0) {
>       -		warning_errno(_("could not read '%s'"), path);
>       +		if (errno != ENOENT && errno != ENOTDIR)
>   6:  6ead240957 !  5:  f30ad07823 sequencer: make read_oneliner() accept flags
>      @@ sequencer.c: static int write_message(const void *buf, size_t len, const char *f
>       +#define READ_ONELINER_SKIP_IF_EMPTY (1 << 0)
>       +
>        /*
>      -  * Resets a strbuf then reads a file that was presumably written by a shell
>      -  * script, i.e. with an end-of-line marker that needs to be stripped.
>      +  * Reads a file that was presumably written by a shell script, i.e. with an
>      +  * end-of-line marker that needs to be stripped.
>       @@ sequencer.c: static int write_message(const void *buf, size_t len, const char *filename,
>         * Returns 1 if the file was read, 0 if it could not be read or does not exist.
>         */
>      @@ sequencer.c: static int write_message(const void *buf, size_t len, const char *f
>       -	const char *path, int skip_if_empty)
>       +	const char *path, unsigned flags)
>        {
>      - 	strbuf_reset(buf);
>      - 	if (strbuf_read_file(buf, path, 0) < 0) {
>      + 	int orig_len = buf->len;
>      +
>       @@ sequencer.c: static int read_oneliner(struct strbuf *buf,
>      + 		buf->buf[buf->len] = '\0';
>      + 	}
>        
>      - 	strbuf_trim(buf);
>      -
>      --	if (skip_if_empty && !buf->len)
>      -+	if ((flags & READ_ONELINER_SKIP_IF_EMPTY) && !buf->len)
>      +-	if (skip_if_empty && buf->len == orig_len)
>      ++	if ((flags & READ_ONELINER_SKIP_IF_EMPTY) && buf->len == orig_len)
>        		return 0;
>        
>        	return 1;
>      @@ sequencer.c: static int read_populate_opts(struct replay_opts *opts)
>        				strbuf_reset(&buf);
>        			else {
>       @@ sequencer.c: static int read_populate_opts(struct replay_opts *opts)
>      - 			}
>      + 			strbuf_reset(&buf);
>        		}
>        
>       -		if (read_oneliner(&buf, rebase_path_allow_rerere_autoupdate(), 1)) {
>      @@ sequencer.c: static int read_populate_opts(struct replay_opts *opts)
>        				opts->allow_rerere_auto = RERERE_AUTOUPDATE;
>        			else if (!strcmp(buf.buf, "--no-rerere-autoupdate"))
>       @@ sequencer.c: static int read_populate_opts(struct replay_opts *opts)
>      - 		read_strategy_opts(opts, &buf);
>      + 		strbuf_reset(&buf);
>        
>        		if (read_oneliner(&opts->current_fixups,
>       -				  rebase_path_current_fixups(), 1)) {
>   7:  2e7922b259 !  6:  8c504427e3 sequencer: configurably warn on non-existent files
>      @@ Commit message
>           read_oneliner() will want the ability to output warnings in the event
>           that the `path` doesn't exist. Introduce the
>           `READ_ONELINER_WARN_MISSING` flag which, if active, would issue a
>      -    warning when a file doesn't exist by skipping the `!file_exists()` check
>      -    and letting `strbuf_read_file()` handle that case.
>      +    warning when a file doesn't exist by always executing warning_errno()
>      +    in the case where strbuf_read_file() fails.
>       
>        ## sequencer.c ##
>       @@ sequencer.c: static int write_message(const void *buf, size_t len, const char *filename,
>      @@ sequencer.c: static int write_message(const void *buf, size_t len, const char *f
>       +#define READ_ONELINER_WARN_MISSING (1 << 1)
>        
>        /*
>      -  * Resets a strbuf then reads a file that was presumably written by a shell
>      +  * Reads a file that was presumably written by a shell script, i.e. with an
>       @@ sequencer.c: static int read_oneliner(struct strbuf *buf,
>      - {
>      - 	strbuf_reset(buf);
>      + 	int orig_len = buf->len;
>      +
>        	if (strbuf_read_file(buf, path, 0) < 0) {
>       -		if (errno != ENOENT && errno != ENOTDIR)
>       +		if ((flags & READ_ONELINER_WARN_MISSING) ||
>      -+				(errno != ENOENT && errno != ENOTDIR))
>      ++		    (errno != ENOENT && errno != ENOTDIR))
>        			warning_errno(_("could not read '%s'"), path);
>        		return 0;
>        	}
>   8:  6c3c37994b !  7:  50e93770e7 sequencer: make read_oneliner() extern
>      @@ sequencer.c: static int write_message(const void *buf, size_t len, const char *f
>       -#define READ_ONELINER_WARN_MISSING (1 << 1)
>       -
>       -/*
>      -- * Resets a strbuf then reads a file that was presumably written by a shell
>      -- * script, i.e. with an end-of-line marker that needs to be stripped.
>      +- * Reads a file that was presumably written by a shell script, i.e. with an
>      +- * end-of-line marker that needs to be stripped.
>       - *
>       - * Note that only the last end-of-line marker is stripped, consistent with the
>       - * behavior of "$(cat path)" in a shell script.
>      @@ sequencer.c: static int write_message(const void *buf, size_t len, const char *f
>       +int read_oneliner(struct strbuf *buf,
>        	const char *path, unsigned flags)
>        {
>      - 	strbuf_reset(buf);
>      + 	int orig_len = buf->len;
>       
>        ## sequencer.h ##
>       @@ sequencer.h: void print_commit_summary(struct repository *repo,
>      @@ sequencer.h: void print_commit_summary(struct repository *repo,
>       +#define READ_ONELINER_WARN_MISSING (1 << 1)
>       +
>       +/*
>      -+ * Resets a strbuf then reads a file that was presumably written by a shell
>      -+ * script, i.e. with an end-of-line marker that needs to be stripped.
>      ++ * Reads a file that was presumably written by a shell script, i.e. with an
>      ++ * end-of-line marker that needs to be stripped.
>       + *
>       + * Note that only the last end-of-line marker is stripped, consistent with the
>       + * behavior of "$(cat path)" in a shell script.
>   9:  689f34a2a5 !  8:  0cc279fc14 rebase: use read_oneliner()
>      @@ Commit message
>       
>           Since in sequencer.c, read_one() basically duplicates the functionality
>           of read_oneliner(), reduce code duplication by replacing read_one() with
>      -    read_oneliner(). Also, delete strbuf_reset() calls prior to
>      -    read_oneliner() as read_oneliner() already resets the strbuf.
>      +    read_oneliner().
>       
>      -    This was mostly done with the following Coccinelle script
>      +    This was done with the following Coccinelle script
>       
>                   @@
>                   expression a, b;
>      @@ Commit message
>                   - read_one(a, b)
>                   + !read_oneliner(b, a, READ_ONELINER_WARN_NON_EXISTENCE)
>       
>      -    Long lines were broken up and strbuf_reset()s were deleted manually.
>      +    and long lines were manually broken up.
>       
>        ## builtin/rebase.c ##
>       @@ builtin/rebase.c: static const char *state_dir_path(const char *filename, struct rebase_options *o
>      @@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts)
>        	opts->head_name = starts_with(head_name.buf, "refs/") ?
>        		xstrdup(head_name.buf) : NULL;
>       @@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts)
>      - 	 * head. Fall back to reading from head to cover for the case that the
>      - 	 * user upgraded git with an ongoing interactive rebase.
>        	 */
>      --	strbuf_reset(&buf);
>      + 	strbuf_reset(&buf);
>        	if (file_exists(state_dir_path("orig-head", opts))) {
>       -		if (read_one(state_dir_path("orig-head", opts), &buf))
>       +		if (!read_oneliner(&buf, state_dir_path("orig-head", opts),
>      @@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts)
>        	if (get_oid(buf.buf, &opts->orig_head))
>        		return error(_("invalid orig-head: '%s'"), buf.buf);
>       @@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts)
>      - 	}
>        
>        	if (file_exists(state_dir_path("allow_rerere_autoupdate", opts))) {
>      --		strbuf_reset(&buf);
>      + 		strbuf_reset(&buf);
>       -		if (read_one(state_dir_path("allow_rerere_autoupdate", opts),
>       -			    &buf))
>       +		if (!read_oneliner(&buf, state_dir_path("allow_rerere_autoupdate", opts),
>      @@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts)
>        		if (!strcmp(buf.buf, "--rerere-autoupdate"))
>        			opts->allow_rerere_autoupdate = RERERE_AUTOUPDATE;
>       @@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts)
>      - 	}
>        
>        	if (file_exists(state_dir_path("gpg_sign_opt", opts))) {
>      --		strbuf_reset(&buf);
>      + 		strbuf_reset(&buf);
>       -		if (read_one(state_dir_path("gpg_sign_opt", opts),
>       -			    &buf))
>       +		if (!read_oneliner(&buf, state_dir_path("gpg_sign_opt", opts),
>      @@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts)
>        			return -1;
>        		free(opts->gpg_sign_opt);
>        		opts->gpg_sign_opt = xstrdup(buf.buf);
>      - 	}
>      +@@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts)
>        
>        	if (file_exists(state_dir_path("strategy", opts))) {
>      --		strbuf_reset(&buf);
>      + 		strbuf_reset(&buf);
>       -		if (read_one(state_dir_path("strategy", opts), &buf))
>       +		if (!read_oneliner(&buf, state_dir_path("strategy", opts),
>       +				   READ_ONELINER_WARN_MISSING))
>        			return -1;
>        		free(opts->strategy);
>        		opts->strategy = xstrdup(buf.buf);
>      - 	}
>      +@@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts)
>        
>        	if (file_exists(state_dir_path("strategy_opts", opts))) {
>      --		strbuf_reset(&buf);
>      + 		strbuf_reset(&buf);
>       -		if (read_one(state_dir_path("strategy_opts", opts), &buf))
>       +		if (!read_oneliner(&buf, state_dir_path("strategy_opts", opts),
>       +				   READ_ONELINER_WARN_MISSING))

So up to here I think all the changes since v4 are due to the dropped patch bar the rewording of the message in patch 7 that drops the reference to file_exists()

Junio pointed out a typo in the message to patch 9, apart from that it all looks good to me

Show 10 quoted lines
> 10:  e0b8e409af !  9:  3dbed2a832 sequencer: make apply_rebase() accept a path
>      @@ Metadata
>       Author: Denton Liu <liu.denton@gmail.com>
>       
>        ## Commit message ##
>      -    sequencer: make apply_rebase() accept a path
>      +    sequencer: make apply_autostash() accept a path
>       
>      -    In order to make apply_rebase() more generic for future extraction, make
>      +    In order to make apply_autostash() more generic for future extraction, make
Thanks for fixing that
Show 27 quoted lines
>           it accept a `path` argument so that the location from where to read the
>           reference to the autostash commit can be customized. Remove the `opts`
>           argument since it was unused before anyway.
> 11:  a52583beff = 10:  937b4964d1 sequencer: rename stash_sha1 to stash_oid
> 12:  389b17df33 = 11:  98a7f5280c rebase: use apply_autostash() from sequencer.c
> 13:  fe57e21dbc = 12:  67f3b5c225 rebase: generify reset_head()
> 14:  045668620d = 13:  af5e808667 reset: extract reset_head() from rebase
> 15:  d5f51cd80e = 14:  114d9a7655 rebase: extract create_autostash()
> 16:  9ab10d23d4 = 15:  c2ed4cd39d rebase: generify create_autostash()
> 17:  26cca49be6 = 16:  3be4a27dfe sequencer: extract perform_autostash() from rebase
> 18:  e703022fda = 17:  129d5d97ae sequencer: unlink autostash in apply_autostash()
> 19:  75dc3f10a1 ! 18:  7e04ce8d8e sequencer: implement save_autostash()
>      @@ Commit message
>           function will be used in a future commit.
>       
>           The difference between save_autostash() and apply_autostash() is that
>      -    the latter does not try to apply the stash. It skips that step and
>      +    the former does not try to apply the stash. It skips that step and
>           just stores the created entry in the stash reflog.
>       
>      +    This is useful in the case where we abort an operation when an autostash
>      +    is present but we don't want to dirty the worktree with the application
>      +    of the stash. For example, in a future commit, we will implement
>      +    `git merge --autostash`. Since merges can be aborted using
>      +    `git reset --hard`, we'd make use of save_autostash() to save the
>      +    autostash entry instead of applying it to the worktree thus keeping the
>      +    worktree undirtied.
The reason for the change is much clearer now thanks
Show 39 quoted lines
>      +
>        ## sequencer.c ##
>       @@ sequencer.c: void create_autostash(struct repository *r, const char *path,
>        	strbuf_release(&buf);
> 20:  598ddea6c1 = 19:  732b3f9945 sequencer: implement apply_autostash_oid()
> 21:  7adf794192 ! 20:  f9f698b79a merge: teach --autostash option
>      @@ Commit message
>           `git reset --hard`, the autostash is saved into the stash reflog
>           instead keeping the worktree clean.
>       
>      +    Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
>           Suggested-by: Alban Gruin <alban.gruin@gmail.com>
>       
>        ## Documentation/config/merge.txt ##
>      @@ Documentation/git-merge.txt: will be appended to the specified message.
>        	Abort the current conflict resolution process, and
>       -	try to reconstruct the pre-merge state.
>       +	try to reconstruct the pre-merge state. If an autostash entry is
>      -+	present, apply it back to the worktree.
>      ++	present, apply it to the worktree.
>        +
>        If there were uncommitted worktree changes present when the merge
>        started, 'git merge --abort' will in some cases be unable to
>      @@ Documentation/git-merge.txt: reconstruct these changes. It is therefore recommen
>        +
>        'git merge --abort' is equivalent to 'git reset --merge' when
>       -`MERGE_HEAD` is present.
>      -+`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present where
>      -+the stash entry is applied to the worktree.
>      ++`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
>      ++which case 'git merge --abort' applies the stash entry to the worktree
>      ++whereas 'git reset --merge' will save the stashed changes in the stash
>      ++reflog.
>        
>        --quit::
>        	Forget about the current merge in progress. Leave the index
>      +-	and the working tree as-is.
>      ++	and the working tree as-is. If `MERGE_AUTOSTASH` is present, the
>      ++	stash entry will be saved to the stash reflog.
Thanks for adding that
Show 12 quoted lines
>      +
>      + --continue::
>      + 	After a 'git merge' stops due to conflicts you can conclude the
>       
>        ## Documentation/merge-options.txt ##
>       @@ Documentation/merge-options.txt: ifndef::git-pull[]
>      @@ builtin/merge.c: int cmd_merge(int argc, const char **argv, const char *prefix)
>        			die(_("There is no merge to abort (MERGE_HEAD missing)."));
>        
>       +		if (read_oneliner(&stash_oid, git_path_merge_autostash(the_repository),
>      -+			   READ_ONELINER_SKIP_IF_EMPTY)) {
>      -+			strbuf_trim(&stash_oid);

Makes sense, we are in control of the file so don't need to trim the contents

Show 52 quoted lines
>      ++		    READ_ONELINER_SKIP_IF_EMPTY))
>       +			unlink(git_path_merge_autostash(the_repository));
>      -+		}
>       +
>        		/* Invoke 'git reset --merge' */
>        		ret = cmd_reset(nargc, nargv, prefix);
>      @@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
>        				N_("add exec lines after each commit of the "
>        				   "editable list")),
>       
>      - ## builtin/reset.c ##
>      -@@
>      - #include "cache-tree.h"
>      - #include "submodule.h"
>      - #include "submodule-config.h"
>      -+#include "sequencer.h"
>      -
>      - #define REFRESH_INDEX_DELAY_WARNING_IN_MS (2 * 1000)
>      -
>      -@@ builtin/reset.c: int cmd_reset(int argc, const char **argv, const char *prefix)
>      - 		if (reset_type == HARD && !update_ref_status && !quiet)
>      - 			print_new_head_line(lookup_commit_reference(the_repository, &oid));
>      - 	}
>      --	if (!pathspec.nr)
>      -+	if (!pathspec.nr) {
>      - 		remove_branch_state(the_repository, 0);
>      -+	}
>      -
>      - 	return update_ref_status;
>      - }
>      -
>        ## parse-options.h ##
>       @@ parse-options.h: int parse_opt_passthru_argv(const struct option *, const char *, int);
>        #define OPT_CLEANUP(v) OPT_STRING(0, "cleanup", v, N_("mode"), N_("how to strip spaces and #comments from message"))
>      @@ t/t7600-merge.sh: test_expect_success 'refresh the index before merging' '
>       +	git diff --exit-code
>       +'
>       +
>      ++test_expect_success 'quit merge with --no-commit and --autostash' '
>      ++	git reset --hard c1 &&
>      ++	git merge-file file file.orig file.9 &&
>      ++	git diff >expect &&
>      ++	git merge --no-commit --autostash c2 &&
>      ++	git stash show -p MERGE_AUTOSTASH >actual &&
>      ++	test_cmp expect actual &&
>      ++	git diff HEAD >expect &&
>      ++	git merge --quit 2>err &&
>      ++	test_i18ngrep "Autostash exists; creating a new stash entry." err &&
>      ++	git diff HEAD >actual &&
>      ++	test_cmp expect actual
>      ++'
>      ++
Thanks for the new test

Looking at the range-diff this series looks fine to me now apart from the typo Junio pointed out.

Thanks
Phillip
Show 6 quoted lines
>       +test_expect_success 'merge with conflicted --autostash changes' '
>       +	git reset --hard c1 &&
>       +	git merge-file file file.orig file.9y &&
> 22:  f1e54622fb = 21:  13f3fadbef t5520: make test_pull_autostash() accept expect_parent_num
> 23:  177c7e537b = 22:  f4fec1e780 pull: pass --autostash to merge
>
Previous: Denton LiuNext: Junio C Hamano
Message 151 of 152 in “merge: learn --autostash”
  1. 0/7 merge: learn --autostashDenton Liu, Oct 16, 2019
  2. 1/7 Makefile: alphabetically sort += listsDenton Liu, Oct 16, 2019
  3. Junio C HamanoOct 17, 2019
  4. Johannes SchindelinOct 21, 2019
  5. Denton LiuOct 21, 2019
  6. Johannes SchindelinOct 22, 2019
  7. Junio C HamanoOct 21, 2019
  8. Jeff KingOct 21, 2019
  9. Junio C HamanoOct 22, 2019
  10. 2/7 autostash: extract read_one() from rebaseDenton Liu, Oct 16, 2019
  11. Phillip WoodOct 18, 2019
  12. Johannes SchindelinOct 21, 2019
  13. 3/7 autostash: extract apply_autostash() from rebaseDenton Liu, Oct 16, 2019
  14. 4/7 autostash: extract reset_head() from rebaseDenton Liu, Oct 16, 2019
  15. Phillip WoodOct 18, 2019
  16. Johannes SchindelinOct 21, 2019
  17. 5/7 autostash: extract perform_autostash() from rebaseDenton Liu, Oct 16, 2019
  18. Johannes SchindelinOct 21, 2019
  19. 6/7 autostash.c: undefine USE_THE_INDEX_COMPATIBILITY_MACROSDenton Liu, Oct 16, 2019
  20. Phillip WoodOct 18, 2019
  21. 7/7 merge: teach --autostash optionDenton Liu, Oct 16, 2019
  22. Phillip WoodOct 18, 2019
  23. Denton LiuDec 24, 2019
  24. Johannes SchindelinOct 21, 2019
  25. Denton LiuDec 24, 2019
  26. Denton LiuDec 24, 2019
  27. 00/17 merge: learn --autostashDenton Liu, Dec 24, 2019
  28. 03/17 sequencer: use file strbuf for read_oneliner()Denton Liu, Dec 24, 2019
  29. 02/17 t7600: use test_write_lines()Denton Liu, Dec 24, 2019
  30. 01/17 Makefile: alphabetically sort += listsDenton Liu, Dec 24, 2019
  31. Junio C HamanoDec 30, 2019
  32. 06/17 rebase: use read_oneliner()Denton Liu, Dec 24, 2019
  33. 04/17 sequencer: configurably warn on non-existent filesDenton Liu, Dec 24, 2019
  34. Junio C HamanoDec 26, 2019
  35. 07/17 sequencer: make apply_rebase() accept a pathDenton Liu, Dec 24, 2019
  36. 08/17 rebase: use apply_autostash() from sequencer.cDenton Liu, Dec 24, 2019
  37. 05/17 sequencer: make read_oneliner() externDenton Liu, Dec 24, 2019
  38. 10/17 reset: extract reset_head() from rebaseDenton Liu, Dec 24, 2019
  39. 12/17 rebase: generify create_autostash()Denton Liu, Dec 24, 2019
  40. 13/17 sequencer: extract perform_autostash() from rebaseDenton Liu, Dec 24, 2019
  41. 09/17 rebase: generify reset_head()Denton Liu, Dec 24, 2019
  42. 11/17 rebase: extract create_autostash()Denton Liu, Dec 24, 2019
  43. 17/17 pull: pass --autostash to mergeDenton Liu, Dec 24, 2019
  44. 14/17 sequencer: unlink autostash in apply_autostash()Denton Liu, Dec 24, 2019
  45. 16/17 t5520: make test_pull_autostash() accept expect_parent_numDenton Liu, Dec 24, 2019
  46. 15/17 merge: teach --autostash optionDenton Liu, Dec 24, 2019
  47. Junio C HamanoDec 30, 2019
  48. Phillip WoodDec 31, 2019
  49. Denton LiuJan 8, 2020
  50. Phillip WoodJan 10, 2020
  51. Denton LiuJan 15, 2020
  52. Denton LiuJan 1, 2020
  53. 00/19 merge: learn --autostashDenton Liu, Mar 21, 2020
  54. 02/19 t7600: use test_write_lines()Denton Liu, Mar 21, 2020
  55. 01/19 Makefile: ASCII-sort += listsDenton Liu, Mar 21, 2020
  56. 03/19 sequencer: use file strbuf for read_oneliner()Denton Liu, Mar 21, 2020
  57. Phillip WoodApr 2, 2020
  58. 04/19 sequencer: make read_oneliner() accept flagsDenton Liu, Mar 21, 2020
  59. 05/19 sequencer: configurably warn on non-existent filesDenton Liu, Mar 21, 2020
  60. Phillip WoodApr 2, 2020
  61. 07/19 rebase: use read_oneliner()Denton Liu, Mar 21, 2020
  62. Phillip WoodApr 2, 2020
  63. 06/19 sequencer: make read_oneliner() externDenton Liu, Mar 21, 2020
  64. 08/19 sequencer: make apply_rebase() accept a pathDenton Liu, Mar 21, 2020
  65. 09/19 rebase: use apply_autostash() from sequencer.cDenton Liu, Mar 21, 2020
  66. Phillip WoodApr 2, 2020
  67. 10/19 rebase: generify reset_head()Denton Liu, Mar 21, 2020
  68. 11/19 reset: extract reset_head() from rebaseDenton Liu, Mar 21, 2020
  69. Phillip WoodApr 2, 2020
  70. 12/19 rebase: extract create_autostash()Denton Liu, Mar 21, 2020
  71. 13/19 rebase: generify create_autostash()Denton Liu, Mar 21, 2020
  72. 14/19 sequencer: extract perform_autostash() from rebaseDenton Liu, Mar 21, 2020
  73. 15/19 sequencer: unlink autostash in apply_autostash()Denton Liu, Mar 21, 2020
  74. 16/19 sequencer: implement save_autostash()Denton Liu, Mar 21, 2020
  75. Phillip WoodApr 2, 2020
  76. 18/19 t5520: make test_pull_autostash() accept expect_parent_numDenton Liu, Mar 21, 2020
  77. 17/19 merge: teach --autostash optionDenton Liu, Mar 21, 2020
  78. Phillip WoodApr 2, 2020
  79. Denton LiuApr 3, 2020
  80. Denton LiuApr 3, 2020
  81. Phillip WoodApr 3, 2020
  82. Denton LiuApr 3, 2020
  83. Phillip WoodApr 3, 2020
  84. Denton LiuApr 3, 2020
  85. 19/19 pull: pass --autostash to mergeDenton Liu, Mar 21, 2020
  86. Phillip WoodApr 2, 2020
  87. 00/23 merge: learn --autostashDenton Liu, Apr 4, 2020
  88. 02/23 t7600: use test_write_lines()Denton Liu, Apr 4, 2020
  89. 03/23 sequencer: stop leaking bufDenton Liu, Apr 4, 2020
  90. Junio C HamanoApr 5, 2020
  91. Junio C HamanoApr 5, 2020
  92. Denton LiuApr 5, 2020
  93. 05/23 sequencer: make file exists check more efficientDenton Liu, Apr 4, 2020
  94. 04/23 sequencer: reuse strbuf_trim() in read_oneliner()Denton Liu, Apr 4, 2020
  95. Junio C HamanoApr 5, 2020
  96. Denton LiuApr 6, 2020
  97. Phillip WoodApr 6, 2020
  98. Phillip WoodApr 6, 2020
  99. Denton LiuApr 7, 2020
  100. 07/23 sequencer: configurably warn on non-existent filesDenton Liu, Apr 4, 2020
  101. Phillip WoodApr 6, 2020
  102. 09/23 rebase: use read_oneliner()Denton Liu, Apr 4, 2020
  103. 01/23 Makefile: ASCII-sort += listsDenton Liu, Apr 4, 2020
  104. 08/23 sequencer: make read_oneliner() externDenton Liu, Apr 4, 2020
  105. 12/23 rebase: use apply_autostash() from sequencer.cDenton Liu, Apr 4, 2020
  106. 11/23 sequencer: rename stash_sha1 to stash_oidDenton Liu, Apr 4, 2020
  107. 15/23 rebase: extract create_autostash()Denton Liu, Apr 4, 2020
  108. 13/23 rebase: generify reset_head()Denton Liu, Apr 4, 2020
  109. 16/23 rebase: generify create_autostash()Denton Liu, Apr 4, 2020
  110. 17/23 sequencer: extract perform_autostash() from rebaseDenton Liu, Apr 4, 2020
  111. 18/23 sequencer: unlink autostash in apply_autostash()Denton Liu, Apr 4, 2020
  112. 20/23 sequencer: implement apply_autostash_oid()Denton Liu, Apr 4, 2020
  113. 14/23 reset: extract reset_head() from rebaseDenton Liu, Apr 4, 2020
  114. 22/23 t5520: make test_pull_autostash() accept expect_parent_numDenton Liu, Apr 4, 2020
  115. 19/23 sequencer: implement save_autostash()Denton Liu, Apr 4, 2020
  116. Phillip WoodApr 6, 2020
  117. 23/23 pull: pass --autostash to mergeDenton Liu, Apr 4, 2020
  118. 10/23 sequencer: make apply_rebase() accept a pathDenton Liu, Apr 4, 2020
  119. Phillip WoodApr 6, 2020
  120. 21/23 merge: teach --autostash optionDenton Liu, Apr 4, 2020
  121. Phillip WoodApr 6, 2020
  122. Denton LiuApr 7, 2020
  123. Phillip WoodApr 7, 2020
  124. 06/23 sequencer: make read_oneliner() accept flagsDenton Liu, Apr 4, 2020
  125. 00/22 merge: learn --autostashDenton Liu, Apr 7, 2020
  126. 02/22 t7600: use test_write_lines()Denton Liu, Apr 7, 2020
  127. 01/22 Makefile: ASCII-sort += listsDenton Liu, Apr 7, 2020
  128. 04/22 sequencer: make file exists check more efficientDenton Liu, Apr 7, 2020
  129. Junio C HamanoApr 8, 2020
  130. 03/22 sequencer: stop leaking bufDenton Liu, Apr 7, 2020
  131. 05/22 sequencer: make read_oneliner() accept flagsDenton Liu, Apr 7, 2020
  132. Junio C HamanoApr 8, 2020
  133. 06/22 sequencer: configurably warn on non-existent filesDenton Liu, Apr 7, 2020
  134. 07/22 sequencer: make read_oneliner() externDenton Liu, Apr 7, 2020
  135. 08/22 rebase: use read_oneliner()Denton Liu, Apr 7, 2020
  136. Junio C HamanoApr 8, 2020
  137. 11/22 rebase: use apply_autostash() from sequencer.cDenton Liu, Apr 7, 2020
  138. 12/22 rebase: generify reset_head()Denton Liu, Apr 7, 2020
  139. 14/22 rebase: extract create_autostash()Denton Liu, Apr 7, 2020
  140. 15/22 rebase: generify create_autostash()Denton Liu, Apr 7, 2020
  141. 13/22 reset: extract reset_head() from rebaseDenton Liu, Apr 7, 2020
  142. 10/22 sequencer: rename stash_sha1 to stash_oidDenton Liu, Apr 7, 2020
  143. 09/22 sequencer: make apply_autostash() accept a pathDenton Liu, Apr 7, 2020
  144. 16/22 sequencer: extract perform_autostash() from rebaseDenton Liu, Apr 7, 2020
  145. 17/22 sequencer: unlink autostash in apply_autostash()Denton Liu, Apr 7, 2020
  146. 21/22 t5520: make test_pull_autostash() accept expect_parent_numDenton Liu, Apr 7, 2020
  147. 18/22 sequencer: implement save_autostash()Denton Liu, Apr 7, 2020
  148. 19/22 sequencer: implement apply_autostash_oid()Denton Liu, Apr 7, 2020
  149. 20/22 merge: teach --autostash optionDenton Liu, Apr 7, 2020
  150. 22/22 pull: pass --autostash to mergeDenton Liu, Apr 7, 2020
  151. Phillip WoodApr 10, 2020
  152. Junio C HamanoApr 10, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.