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

Re: [GSoC][PATCH v5 11/20] rebase -i: rewrite complete_action() in C

From
PWPhillip Wood <phillip.wood@talktalk.net>
Date
Aug 9, 2018, 14:22 UTC
Message-ID
<f2698204-c376-0b0c-b151-22b45d482b7c@talktalk.net>
In-Reply-To
<20180731180003.5421-12-alban.gruin@gmail.com>
Hi Alban

Its nice to see things coming together so that the rebase happens in the same process as the some of the todo file preparation. I've ended up making quite a few comments on the new implementation, but they're all little things, the basic idea looks sound to me.

On 31/07/18 18:59, Alban Gruin wrote:
Show 57 quoted lines
> This rewrites complete_action() from shell to C.
> 
> A new mode is added to rebase--helper (`--complete-action`), as well as
> a new flag (`--autosquash`).
> 
> Finally, complete_action() is stripped from git-rebase--interactive.sh.
> 
> The original complete_action() would return the code 2 when the todo
> list contained no actions.  This was a special case for rebase -i and
> -p; git-rebase.sh would then apply the autostash, delete the state
> directory, and die with the message "Nothing to do".  This cleanup is
> rewritten in C instead of returning 2.  As rebase -i no longer returns
> 2, the comment describing this behaviour in git-rebase.sh is updated to
> reflect this change.
> 
> The first check might seem useless as we write "noop" to the todo list
> if it is empty.  Actually, the todo list might contain commented
> commands (ie. empty commits).  In this case, complete_action() won’t
> write "noop", and will abort without starting the editor.
> 
> Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
> ---
> No changes since v4.
> 
>   builtin/rebase--helper.c   | 12 ++++-
>   git-rebase--interactive.sh | 53 ++------------------
>   git-rebase.sh              |  2 +-
>   sequencer.c                | 99 ++++++++++++++++++++++++++++++++++++++
>   sequencer.h                |  4 ++
>   5 files changed, 118 insertions(+), 52 deletions(-)
> 
> diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
> index bed3dd2b95..d7fa5a5062 100644
> --- a/builtin/rebase--helper.c
> +++ b/builtin/rebase--helper.c
> @@ -13,13 +13,13 @@ static const char * const builtin_rebase_helper_usage[] = {
>   int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
>   {
>   	struct replay_opts opts = REPLAY_OPTS_INIT;
> -	unsigned flags = 0, keep_empty = 0, rebase_merges = 0;
> +	unsigned flags = 0, keep_empty = 0, rebase_merges = 0, autosquash = 0;
>   	int abbreviate_commands = 0, rebase_cousins = -1;
>   	enum {
>   		CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
>   		CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH,
>   		ADD_EXEC, APPEND_TODO_HELP, EDIT_TODO, PREPARE_BRANCH,
> -		CHECKOUT_ONTO
> +		CHECKOUT_ONTO, COMPLETE_ACTION
>   	} command = 0;
>   	struct option options[] = {
>   		OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
> @@ -29,6 +29,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
>   		OPT_BOOL(0, "rebase-merges", &rebase_merges, N_("rebase merge commits")),
>   		OPT_BOOL(0, "rebase-cousins", &rebase_cousins,
>   			 N_("keep original branch points of cousins")),
> +		OPT_BOOL(0, "autosquash", &autosquash,
> +			 N_("move commits thas begin with squash!/fixup!")),
s/thas/that/
Show 142 quoted lines
>   		OPT__VERBOSE(&opts.verbose, N_("be verbose")),
>   		OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
>   				CONTINUE),
> @@ -57,6 +59,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
>   			    N_("prepare the branch to be rebased"), PREPARE_BRANCH),
>   		OPT_CMDMODE(0, "checkout-onto", &command,
>   			    N_("checkout a commit"), CHECKOUT_ONTO),
> +		OPT_CMDMODE(0, "complete-action", &command,
> +			    N_("complete the action"), COMPLETE_ACTION),
>   		OPT_END()
>   	};
>   
> @@ -110,5 +114,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
>   		return !!prepare_branch_to_be_rebased(&opts, argv[1]);
>   	if (command == CHECKOUT_ONTO && argc == 4)
>   		return !!checkout_onto(&opts, argv[1], argv[2], argv[3]);
> +	if (command == COMPLETE_ACTION && argc == 6)
> +		return !!complete_action(&opts, flags, argv[1], argv[2], argv[3],
> +					 argv[4], argv[5], autosquash);
> +
>   	usage_with_options(builtin_rebase_helper_usage, options);
>   }
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index b68f108f28..59dc4888a6 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -127,54 +127,6 @@ init_revisions_and_shortrevisions () {
>   	fi
>   }
>   
> -complete_action() {
> -	test -s "$todo" || echo noop >> "$todo"
> -	test -z "$autosquash" || git rebase--helper --rearrange-squash || exit
> -	test -n "$cmd" && git rebase--helper --add-exec-commands "$cmd"
> -
> -	todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
> -	todocount=${todocount##* }
> -
> -cat >>"$todo" <<EOF
> -
> -$comment_char $(eval_ngettext \
> -	"Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \
> -	"Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \
> -	"$todocount")
> -EOF
> -	git rebase--helper --append-todo-help ${keep_empty:+--keep-empty}
> -
> -	has_action "$todo" ||
> -		return 2
> -
> -	cp "$todo" "$todo".backup
> -	collapse_todo_ids
> -	git_sequence_editor "$todo" ||
> -		die_abort "$(gettext "Could not execute editor")"
> -
> -	has_action "$todo" ||
> -		return 2
> -
> -	git rebase--helper --check-todo-list || {
> -		ret=$?
> -		git rebase--helper --checkout-onto "$onto_name" "$onto" \
> -		    "$orig_head" ${verbose:+--verbose}
> -		exit $ret
> -	}
> -
> -	expand_todo_ids
> -
> -	test -n "$force_rebase" ||
> -	onto="$(git rebase--helper --skip-unnecessary-picks)" ||
> -	die "Could not skip unnecessary pick commands"
> -
> -	git rebase--helper --checkout-onto "$onto_name" "$onto" "$orig_head" \
> -	    ${verbose:+--verbose}
> -	require_clean_work_tree "rebase"
> -	exec git rebase--helper ${force_rebase:+--no-ff} $allow_empty_message \
> -	     --continue
> -}
> -
>   git_rebase__interactive () {
>   	initiate_action "$action"
>   	ret=$?
> @@ -193,5 +145,8 @@ git_rebase__interactive () {
>   		$revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
>   	die "$(gettext "Could not generate todo list")"
>   
> -	complete_action
> +	exec git rebase--helper --complete-action "$shortrevisions" "$onto_name" \
> +		"$shortonto" "$orig_head" "$cmd" $allow_empty_message \
> +		${autosquash:+--autosquash} ${keep_empty:+--keep-empty} \
> +		${verbose:+--verbose} ${force_rebase:+--no-ff}
>   }
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 7973447645..51a6db7daa 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -219,7 +219,7 @@ run_specific_rebase () {
>   	if test $ret -eq 0
>   	then
>   		finish_rebase
> -	elif test $ret -eq 2 # special exit status for rebase -i
> +	elif test $ret -eq 2 # special exit status for rebase -p
>   	then
>   		apply_autostash &&
>   		rm -rf "$state_dir" &&
> diff --git a/sequencer.c b/sequencer.c
> index a2e04b9eca..8102e24b19 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -30,6 +30,7 @@
>   #include "oidset.h"
>   #include "commit-slab.h"
>   #include "alias.h"
> +#include "rebase-interactive.h"
>   
>   #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
>   
> @@ -53,6 +54,9 @@ static GIT_PATH_FUNC(rebase_path, "rebase-merge")
>    * file and written to the tail of 'done'.
>    */
>   GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo")
> +static GIT_PATH_FUNC(rebase_path_todo_backup,
> +		     "rebase-merge/git-rebase-todo.backup")
> +
>   /*
>    * The rebase command lines that have already been processed. A line
>    * is moved here when it is first handled, before any associated user
> @@ -4499,6 +4503,101 @@ int skip_unnecessary_picks(struct object_id *output_oid)
>   	return 0;
>   }
>   
> +int complete_action(struct replay_opts *opts, unsigned flags,
> +		    const char *shortrevisions, const char *onto_name,
> +		    const char *onto, const char *orig_head, const char *cmd,
> +		    unsigned autosquash)
> +{
> +	const char *shortonto, *todo_file = rebase_path_todo();
> +	struct todo_list todo_list = TODO_LIST_INIT;
> +	struct strbuf *buf = &(todo_list.buf);
> +	struct object_id oid;
> +	struct stat st;
> +
> +	get_oid(onto, &oid);

Is onto guaranteed to exist? If not the return value of get_oid() needs to be checked. Otherwise a comment or an assertion might be useful here.

Show 8 quoted lines
> +	shortonto = find_unique_abbrev(&oid, DEFAULT_ABBREV);
> +
> +	if (!lstat(todo_file, &st) && st.st_size == 0 &&
> +	    write_message("noop\n", 5, todo_file, 0))
> +		return error_errno(_("could not write '%s'"), todo_file);
> +
> +	if (autosquash && rearrange_squash())
> +		return 1;

git functions normally return -1 for an error as the 'return error(...)' does above, is there a reason for a different return value here?

Show 7 quoted lines
> +
> +	if (cmd && *cmd)
> +		sequencer_add_exec_commands(cmd); > +
> +	if (strbuf_read_file(buf, todo_file, 0) < 0)
> +		return error_errno(_("could not read '%s'."), todo_file);
> +
> +	if (parse_insn_buffer(buf->buf, &todo_list)) {

I was worried when I saw this because buf is an alias of todo_list.buf and I thought passing the same buffer in twice would end badly. However parse_insn_buffer() has a confusing signature, it expects the caller to have filled todo_list.buf with the buffer to be parsed and to pass a pointer to the same buffer. I think this should be cleaned up at some point but it is outside the scope of this series.

Show 10 quoted lines
> +		todo_list_release(&todo_list);
> +		return error(_("unusable todo list: '%s'"), todo_file);
> +	}
> +
> +	if (count_commands(&todo_list) == 0) {
> +		apply_autostash(opts);
> +		sequencer_remove_state(opts);
> +		todo_list_release(&todo_list);
> +
> +		fputs("Nothing to do\n", stderr);

The capital 'N' is a faithful copy of the current message in rebase.sh. However it might be worth changing it to 'n' to match the normal style of git error messages starting with a lowercase letter.

> +		return 1;
It might be better to do 'return error(...)' instead
Show 16 quoted lines
> +	}
> +
> +	strbuf_addch(buf, '\n');
> +	strbuf_commented_addf(buf, Q_("Rebase %s onto %s (%d command)",
> +				      "Rebase %s onto %s (%d commands)",
> +				      count_commands(&todo_list)),
> +			      shortrevisions, shortonto, count_commands(&todo_list));
> +	append_todo_help(0, flags & TODO_LIST_KEEP_EMPTY, buf);
> +
> +	if (write_message(buf->buf, buf->len, todo_file, 0)) {
> +		todo_list_release(&todo_list);
> +		return error_errno(_("could not write '%s'"), todo_file);
> +	}
> +
> +	copy_file(rebase_path_todo_backup(), todo_file, 0666);
> +	transform_todos(flags | TODO_LIST_SHORTEN_IDS);

Both of the above lines can fail, so the return values need checking I think.

Show 9 quoted lines
> +
> +	strbuf_reset(buf);
> +
> +	if (launch_sequence_editor(todo_file, buf, NULL)) {
> +		apply_autostash(opts);
> +		sequencer_remove_state(opts);
> +		todo_list_release(&todo_list);
> +
> +		return error(_("could not execute editor"));

I think launch_sequence_editor() will have printed an error message already, so this is unnecessary.

Show 10 quoted lines
> +	}
> +
> +	strbuf_stripspace(buf, 1);
> +	if (buf->len == 0) {
> +		apply_autostash(opts);
> +		sequencer_remove_state(opts);
> +		todo_list_release(&todo_list);
> +
> +		fputs("Nothing to do\n", stderr);
> +		return 1;
See my comments above about 'N' and using 'return error(...)'
Show 7 quoted lines
> +	}
> +
> +	todo_list_release(&todo_list);
> +
> +	if (check_todo_list()) {
> +		checkout_onto(opts, onto_name, onto, orig_head);
> +		return 1;
s/1/-1/?
> +	}
> +
> +	transform_todos(flags & ~(TODO_LIST_SHORTEN_IDS));
I think the return value of transform_todos() needs to be checked
Show 6 quoted lines
> +	if (opts->allow_ff && skip_unnecessary_picks(&oid))
> +		return error(_("could not skip unnecessary pick commands"));
> +
> +	checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_head);
> +	if (require_clean_work_tree("rebase", "", 1, 1))
> +		return 1;
s/1/-1/?
Best Wishes
Phillip
Show 23 quoted lines
> +
> +	return sequencer_continue(opts);
> +}
> +
>   struct subject2item_entry {
>   	struct hashmap_entry entry;
>   	int i;
> diff --git a/sequencer.h b/sequencer.h
> index f11dabfd65..3ab3791c8a 100644
> --- a/sequencer.h
> +++ b/sequencer.h
> @@ -89,6 +89,10 @@ int transform_todos(unsigned flags);
>   enum missing_commit_check_level get_missing_commit_check_level(void);
>   int check_todo_list(void);
>   int skip_unnecessary_picks(struct object_id *output_oid);
> +int complete_action(struct replay_opts *opts, unsigned flags,
> +		    const char *shortrevisions, const char *onto_name,
> +		    const char *onto, const char *orig_head, const char *cmd,
> +		    unsigned autosquash);
>   int rearrange_squash(void);
>   
>   extern const char sign_off_header[];
>
Previous: Alban GruinNext: Alban Gruin
Message 107 of 193 in “rebase -i: rewrite some parts in C”
  1. Alban GruinJul 2, 2018
  2. [GSoC][PATCH v2 1/7] sequencer: make two functions and an enum from sequencer.c publicAlban Gruin, Jul 2, 2018
  3. Junio C HamanoJul 3, 2018
  4. Alban GruinJul 5, 2018
  5. [GSoC][PATCH v2 2/7] rebase--interactive: rewrite append_todo_help() in CAlban Gruin, Jul 2, 2018
  6. Junio C HamanoJul 3, 2018
  7. [GSoC][PATCH v2 4/7] rebase-interactive: rewrite the edit-todo functionality in CAlban Gruin, Jul 2, 2018
  8. [GSoC][PATCH v2 3/7] editor: add a function to launch the sequence editorAlban Gruin, Jul 2, 2018
  9. Junio C HamanoJul 3, 2018
  10. [GSoC][PATCH v2 6/7] rebase -i: rewrite setup_reflog_action() in CAlban Gruin, Jul 2, 2018
  11. Junio C HamanoJul 3, 2018
  12. Johannes SchindelinJul 6, 2018
  13. Junio C HamanoJul 6, 2018
  14. Johannes SchindelinJul 6, 2018
  15. Junio C HamanoJul 6, 2018
  16. Junio C HamanoJul 7, 2018
  17. [GSoC][PATCH v2 7/7] rebase -i: rewrite checkout_onto() in CAlban Gruin, Jul 2, 2018
  18. [GSoC][PATCH v2 5/7] sequencer: add a new function to silence a command, except if it fails.Alban Gruin, Jul 2, 2018
  19. Junio C HamanoJul 3, 2018
  20. [GSoC][PATCH v3 00/13] rebase -i: rewrite some parts in CAlban Gruin, Jul 10, 2018
  21. [GSoC][PATCH v3 01/13] sequencer: make two functions and an enum from sequencer.c publicAlban Gruin, Jul 10, 2018
  22. Junio C HamanoJul 10, 2018
  23. [GSoC][PATCH v3 02/13] rebase--interactive: rewrite append_todo_help() in CAlban Gruin, Jul 10, 2018
  24. Alban GruinJul 10, 2018
  25. Junio C HamanoJul 10, 2018
  26. [GSoC][PATCH v3 07/13] rebase -i: rewrite checkout_onto() in CAlban Gruin, Jul 10, 2018
  27. Junio C HamanoJul 10, 2018
  28. [GSoC][PATCH v3 08/13] sequencer: refactor append_todo_help() to write its message to a bufferAlban Gruin, Jul 10, 2018
  29. Junio C HamanoJul 10, 2018
  30. [GSoC][PATCH v3 10/13] rebase--interactive: rewrite complete_action() in CAlban Gruin, Jul 10, 2018
  31. Junio C HamanoJul 10, 2018
  32. Alban GruinJul 11, 2018
  33. [GSoC][PATCH v3 13/13] rebase -i: rewrite the rest of init_revisions_and_shortrevisions in CAlban Gruin, Jul 10, 2018
  34. [GSoC][PATCH v3 11/13] rebase--interactive: remove unused modes and functionsAlban Gruin, Jul 10, 2018
  35. Junio C HamanoJul 10, 2018
  36. [GSoC][PATCH v3 12/13] rebase -i: implement the logic to initialize the variable $revision in CAlban Gruin, Jul 10, 2018
  37. Junio C HamanoJul 12, 2018
  38. Junio C HamanoJul 12, 2018
  39. [GSoC][PATCH v3 09/13] sequencer: change the way skip_unnecessary_picks() returns its resultAlban Gruin, Jul 10, 2018
  40. Junio C HamanoJul 10, 2018
  41. Junio C HamanoJul 10, 2018
  42. [GSoC][PATCH v3 04/13] rebase-interactive: rewrite the edit-todo functionality in CAlban Gruin, Jul 10, 2018
  43. Junio C HamanoJul 10, 2018
  44. [GSoC][PATCH v3 05/13] sequencer: add a new function to silence a command, except if it failsAlban Gruin, Jul 10, 2018
  45. Junio C HamanoJul 10, 2018
  46. [GSoC][PATCH v3 03/13] editor: add a function to launch the sequence editorAlban Gruin, Jul 10, 2018
  47. Alban GruinJul 10, 2018
  48. Junio C HamanoJul 10, 2018
  49. [GSoC][PATCH v3 06/13] rebase -i: rewrite setup_reflog_action() in CAlban Gruin, Jul 10, 2018
  50. Junio C HamanoJul 10, 2018
  51. [GSoC][PATCH v4 00/20] rebase -i: rewrite in CAlban Gruin, Jul 24, 2018
  52. [GSoC][PATCH v4 01/20] sequencer: make two functions and an enum from sequencer.c publicAlban Gruin, Jul 24, 2018
  53. [GSoC][PATCH v4 02/20] rebase -i: rewrite append_todo_help() in CAlban Gruin, Jul 24, 2018
  54. [GSoC][PATCH v4 03/20] editor: add a function to launch the sequence editorAlban Gruin, Jul 24, 2018
  55. [GSoC][PATCH v4 04/20] rebase -i: rewrite the edit-todo functionality in CAlban Gruin, Jul 24, 2018
  56. [GSoC][PATCH v4 05/20] sequencer: add a new function to silence a command, except if it failsAlban Gruin, Jul 24, 2018
  57. [GSoC][PATCH v4 06/20] rebase -i: rewrite setup_reflog_action() in CAlban Gruin, Jul 24, 2018
  58. [GSoC][PATCH v4 07/20] rebase -i: rewrite checkout_onto() in CAlban Gruin, Jul 24, 2018
  59. [GSoC][PATCH v4 08/20] sequencer: refactor append_todo_help() to write its message to a bufferAlban Gruin, Jul 24, 2018
  60. [GSoC][PATCH v4 09/20] sequencer: change the way skip_unnecessary_picks() returns its resultAlban Gruin, Jul 24, 2018
  61. [GSoC][PATCH v4 10/20] t3404: todo list with commented-out commands only abortsAlban Gruin, Jul 24, 2018
  62. [GSoC][PATCH v4 11/20] rebase -i: rewrite complete_action() in CAlban Gruin, Jul 24, 2018
  63. [GSoC][PATCH v4 12/20] rebase -i: remove unused modes and functionsAlban Gruin, Jul 24, 2018
  64. [GSoC][PATCH v4 13/20] rebase -i: implement the logic to initialize $revisions in CAlban Gruin, Jul 24, 2018
  65. [GSoC][PATCH v4 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in CAlban Gruin, Jul 24, 2018
  66. [GSoC][PATCH v4 15/20] rebase -i: rewrite write_basic_state() in CAlban Gruin, Jul 24, 2018
  67. SZEDER GáborJul 30, 2018
  68. Alban GruinJul 30, 2018
  69. [GSoC][PATCH v4] fixup! rebase -i: rewrite write_basic_state() in CAlban Gruin, Jul 31, 2018
  70. Junio C HamanoJul 31, 2018
  71. Alban GruinJul 31, 2018
  72. Junio C HamanoJul 31, 2018
  73. Junio C HamanoJul 31, 2018
  74. Jeff KingAug 3, 2018
  75. [GSoC][PATCH v4 16/20] rebase -i: rewrite init_basic_state() in CAlban Gruin, Jul 24, 2018
  76. [GSoC][PATCH v4 17/20] rebase -i: implement the main part of interactive rebase as a builtinAlban Gruin, Jul 24, 2018
  77. [GSoC][PATCH v4 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in CAlban Gruin, Jul 24, 2018
  78. [GSoC][PATCH v4 19/20] rebase -i: remove git-rebase--interactive.shAlban Gruin, Jul 24, 2018
  79. [GSoC][PATCH v4 20/20] rebase -i: move rebase--helper modes to rebase--interactiveAlban Gruin, Jul 24, 2018
  80. Stefan BellerJul 25, 2018
  81. Junio C HamanoJul 25, 2018
  82. [GSoC][PATCH v5 00/20] rebase -i: rewrite in CAlban Gruin, Jul 31, 2018
  83. [GSoC][PATCH v5 01/20] sequencer: make two functions and an enum from sequencer.c publicAlban Gruin, Jul 31, 2018
  84. [GSoC][PATCH v5 02/20] rebase -i: rewrite append_todo_help() in CAlban Gruin, Jul 31, 2018
  85. Phillip WoodAug 7, 2018
  86. Christian CouderAug 7, 2018
  87. Phillip WoodAug 7, 2018
  88. Christian CouderAug 7, 2018
  89. Phillip WoodAug 7, 2018
  90. Alban GruinAug 8, 2018
  91. Phillip WoodAug 8, 2018
  92. [GSoC][PATCH v5 03/20] editor: add a function to launch the sequence editorAlban Gruin, Jul 31, 2018
  93. [GSoC][PATCH v5 04/20] rebase -i: rewrite the edit-todo functionality in CAlban Gruin, Jul 31, 2018
  94. Phillip WoodAug 7, 2018
  95. Alban GruinAug 8, 2018
  96. Phillip WoodAug 8, 2018
  97. Alban GruinAug 9, 2018
  98. Phillip WoodAug 9, 2018
  99. Phillip WoodAug 9, 2018
  100. [GSoC][PATCH v5 05/20] sequencer: add a new function to silence a command, except if it failsAlban Gruin, Jul 31, 2018
  101. [GSoC][PATCH v5 06/20] rebase -i: rewrite setup_reflog_action() in CAlban Gruin, Jul 31, 2018
  102. [GSoC][PATCH v5 07/20] rebase -i: rewrite checkout_onto() in CAlban Gruin, Jul 31, 2018
  103. [GSoC][PATCH v5 08/20] sequencer: refactor append_todo_help() to write its message to a bufferAlban Gruin, Jul 31, 2018
  104. [GSoC][PATCH v5 09/20] sequencer: change the way skip_unnecessary_picks() returns its resultAlban Gruin, Jul 31, 2018
  105. [GSoC][PATCH v5 10/20] t3404: todo list with commented-out commands only abortsAlban Gruin, Jul 31, 2018
  106. [GSoC][PATCH v5 11/20] rebase -i: rewrite complete_action() in CAlban Gruin, Jul 31, 2018
  107. Phillip WoodAug 9, 2018
  108. Alban GruinAug 9, 2018
  109. [GSoC][PATCH v5 12/20] rebase -i: remove unused modes and functionsAlban Gruin, Jul 31, 2018
  110. [GSoC][PATCH v5 13/20] rebase -i: implement the logic to initialize $revisions in CAlban Gruin, Jul 31, 2018
  111. [GSoC][PATCH v5 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in CAlban Gruin, Jul 31, 2018
  112. [GSoC][PATCH v5 16/20] rebase -i: rewrite init_basic_state() in CAlban Gruin, Jul 31, 2018
  113. [GSoC][PATCH v5 15/20] rebase -i: rewrite write_basic_state() in CAlban Gruin, Jul 31, 2018
  114. [GSoC][PATCH v5 17/20] rebase -i: implement the main part of interactive rebase as a builtinAlban Gruin, Jul 31, 2018
  115. [GSoC][PATCH v5 19/20] rebase -i: remove git-rebase--interactive.shAlban Gruin, Jul 31, 2018
  116. [GSoC][PATCH v5 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in CAlban Gruin, Jul 31, 2018
  117. [GSoC][PATCH v5 20/20] rebase -i: move rebase--helper modes to rebase--interactiveAlban Gruin, Jul 31, 2018
  118. Junio C HamanoJul 31, 2018
  119. [GSoC][PATCH v6 00/20] rebase -i: rewrite in CAlban Gruin, Aug 10, 2018
  120. [GSoC][PATCH v6 01/20] sequencer: make three functions and an enum from sequencer.c publicAlban Gruin, Aug 10, 2018
  121. [GSoC][PATCH v6 02/20] rebase -i: rewrite append_todo_help() in CAlban Gruin, Aug 10, 2018
  122. [GSoC][PATCH v6 03/20] editor: add a function to launch the sequence editorAlban Gruin, Aug 10, 2018
  123. [GSoC][PATCH v6 04/20] rebase -i: rewrite the edit-todo functionality in CAlban Gruin, Aug 10, 2018
  124. [GSoC][PATCH v6 05/20] sequencer: add a new function to silence a command, except if it failsAlban Gruin, Aug 10, 2018
  125. [GSoC][PATCH v6 06/20] rebase -i: rewrite setup_reflog_action() in CAlban Gruin, Aug 10, 2018
  126. [GSoC][PATCH v6 07/20] rebase -i: rewrite checkout_onto() in CAlban Gruin, Aug 10, 2018
  127. [GSoC][PATCH v6 08/20] sequencer: refactor append_todo_help() to write its message to a bufferAlban Gruin, Aug 10, 2018
  128. [GSoC][PATCH v6 10/20] t3404: todo list with commented-out commands only abortsAlban Gruin, Aug 10, 2018
  129. [GSoC][PATCH v6 09/20] sequencer: change the way skip_unnecessary_picks() returns its resultAlban Gruin, Aug 10, 2018
  130. [GSoC][PATCH v6 11/20] rebase -i: rewrite complete_action() in CAlban Gruin, Aug 10, 2018
  131. Junio C HamanoAug 10, 2018
  132. Alban GruinAug 10, 2018
  133. Junio C HamanoAug 10, 2018
  134. Alban GruinAug 10, 2018
  135. Phillip WoodAug 17, 2018
  136. [GSoC][PATCH v6 12/20] rebase -i: remove unused modes and functionsAlban Gruin, Aug 10, 2018
  137. [GSoC][PATCH v6 13/20] rebase -i: implement the logic to initialize $revisions in CAlban Gruin, Aug 10, 2018
  138. [GSoC][PATCH v6 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in CAlban Gruin, Aug 10, 2018
  139. [GSoC][PATCH v6 15/20] rebase -i: rewrite write_basic_state() in CAlban Gruin, Aug 10, 2018
  140. Phillip WoodAug 17, 2018
  141. Johannes SchindelinAug 23, 2018
  142. [GSoC][PATCH v6 16/20] rebase -i: rewrite init_basic_state() in CAlban Gruin, Aug 10, 2018
  143. [GSoC][PATCH v6 17/20] rebase -i: implement the main part of interactive rebase as a builtinAlban Gruin, Aug 10, 2018
  144. [GSoC][PATCH v6 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in CAlban Gruin, Aug 10, 2018
  145. Johannes SchindelinAug 22, 2018
  146. Junio C HamanoAug 22, 2018
  147. Johannes SchindelinAug 23, 2018
  148. [GSoC][PATCH v6 19/20] rebase -i: remove git-rebase--interactive.shAlban Gruin, Aug 10, 2018
  149. [GSoC][PATCH v6 20/20] rebase -i: move rebase--helper modes to rebase--interactiveAlban Gruin, Aug 10, 2018
  150. Duy NguyenAug 13, 2018
  151. Alban GruinAug 13, 2018
  152. [GSoC][PATCH v7 00/20] rebase -i: rewrite in CAlban Gruin, Aug 28, 2018
  153. [GSoC][PATCH v7 01/20] sequencer: make three functions and an enum from sequencer.c publicAlban Gruin, Aug 28, 2018
  154. [GSoC][PATCH v7 02/20] rebase -i: rewrite append_todo_help() in CAlban Gruin, Aug 28, 2018
  155. [GSoC][PATCH v7 03/20] editor: add a function to launch the sequence editorAlban Gruin, Aug 28, 2018
  156. [GSoC][PATCH v7 04/20] rebase -i: rewrite the edit-todo functionality in CAlban Gruin, Aug 28, 2018
  157. [GSoC][PATCH v7 05/20] sequencer: add a new function to silence a command, except if it failsAlban Gruin, Aug 28, 2018
  158. [GSoC][PATCH v7 06/20] rebase -i: rewrite setup_reflog_action() in CAlban Gruin, Aug 28, 2018
  159. [GSoC][PATCH v7 07/20] rebase -i: rewrite checkout_onto() in CAlban Gruin, Aug 28, 2018
  160. [GSoC][PATCH v7 08/20] sequencer: refactor append_todo_help() to write its message to a bufferAlban Gruin, Aug 28, 2018
  161. [GSoC][PATCH v7 09/20] sequencer: change the way skip_unnecessary_picks() returns its resultAlban Gruin, Aug 28, 2018
  162. [GSoC][PATCH v7 10/20] t3404: todo list with commented-out commands only abortsAlban Gruin, Aug 28, 2018
  163. [GSoC][PATCH v7 11/20] rebase -i: rewrite complete_action() in CAlban Gruin, Aug 28, 2018
  164. [GSoC][PATCH v7 12/20] rebase -i: remove unused modes and functionsAlban Gruin, Aug 28, 2018
  165. [GSoC][PATCH v7 13/20] rebase -i: implement the logic to initialize $revisions in CAlban Gruin, Aug 28, 2018
  166. [GSoC][PATCH v7 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in CAlban Gruin, Aug 28, 2018
  167. [GSoC][PATCH v7 16/20] rebase -i: rewrite init_basic_state() in CAlban Gruin, Aug 28, 2018
  168. [GSoC][PATCH v7 15/20] rebase -i: rewrite write_basic_state() in CAlban Gruin, Aug 28, 2018
  169. [GSoC][PATCH v7 17/20] rebase -i: implement the main part of interactive rebase as a builtinAlban Gruin, Aug 28, 2018
  170. [GSoC][PATCH v7 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in CAlban Gruin, Aug 28, 2018
  171. [GSoC][PATCH v7 19/20] rebase -i: remove git-rebase--interactive.shAlban Gruin, Aug 28, 2018
  172. [GSoC][PATCH v7 20/20] rebase -i: move rebase--helper modes to rebase--interactiveAlban Gruin, Aug 28, 2018
  173. [GSoC][PATCH v8 00/20] rebase -i: rewrite in CAlban Gruin, Sep 27, 2018
  174. [GSoC][PATCH v8 01/20] sequencer: make three functions and an enum from sequencer.c publicAlban Gruin, Sep 27, 2018
  175. [GSoC][PATCH v8 02/20] rebase -i: rewrite append_todo_help() in CAlban Gruin, Sep 27, 2018
  176. [GSoC][PATCH v8 03/20] editor: add a function to launch the sequence editorAlban Gruin, Sep 27, 2018
  177. [GSoC][PATCH v8 04/20] rebase -i: rewrite the edit-todo functionality in CAlban Gruin, Sep 27, 2018
  178. [GSoC][PATCH v8 05/20] sequencer: add a new function to silence a command, except if it failsAlban Gruin, Sep 27, 2018
  179. [GSoC][PATCH v8 06/20] rebase -i: rewrite setup_reflog_action() in CAlban Gruin, Sep 27, 2018
  180. [GSoC][PATCH v8 07/20] rebase -i: rewrite checkout_onto() in CAlban Gruin, Sep 27, 2018
  181. [GSoC][PATCH v8 09/20] sequencer: change the way skip_unnecessary_picks() returns its resultAlban Gruin, Sep 27, 2018
  182. [GSoC][PATCH v8 08/20] sequencer: refactor append_todo_help() to write its message to a bufferAlban Gruin, Sep 27, 2018
  183. [GSoC][PATCH v8 10/20] t3404: todo list with commented-out commands only abortsAlban Gruin, Sep 27, 2018
  184. [GSoC][PATCH v8 11/20] rebase -i: rewrite complete_action() in CAlban Gruin, Sep 27, 2018
  185. [GSoC][PATCH v8 12/20] rebase -i: remove unused modes and functionsAlban Gruin, Sep 27, 2018
  186. [GSoC][PATCH v8 13/20] rebase -i: implement the logic to initialize $revisions in CAlban Gruin, Sep 27, 2018
  187. [GSoC][PATCH v8 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in CAlban Gruin, Sep 27, 2018
  188. [GSoC][PATCH v8 16/20] rebase -i: rewrite init_basic_state() in CAlban Gruin, Sep 27, 2018
  189. [GSoC][PATCH v8 15/20] rebase -i: rewrite write_basic_state() in CAlban Gruin, Sep 27, 2018
  190. [GSoC][PATCH v8 17/20] rebase -i: implement the main part of interactive rebase as a builtinAlban Gruin, Sep 27, 2018
  191. [GSoC][PATCH v8 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in CAlban Gruin, Sep 27, 2018
  192. [GSoC][PATCH v8 19/20] rebase -i: remove git-rebase--interactive.shAlban Gruin, Sep 27, 2018
  193. [GSoC][PATCH v8 20/20] rebase -i: move rebase--helper modes to rebase--interactiveAlban Gruin, Sep 27, 2018

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.