git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
From: Alban Gruin <alban.gruin@gmail.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>,
	Christian Couder <christian.couder@gmail.com>,
	Pratik Karki <predatoramigo@gmail.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	phillip.wood@dunelm.org.uk, gitster@pobox.com,
	Alban Gruin <alban.gruin@gmail.com>
Subject: [GSoC][PATCH v8 11/20] rebase -i: rewrite complete_action() in C
Date: Thu, 27 Sep 2018 23:56:01 +0200
Message-ID: <20180927215610.32210-12-alban.gruin@gmail.com> (raw)
In-Reply-To: <20180927215610.32210-1-alban.gruin@gmail.com>

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 message "Nothing to do" is now printed with error(), and so becomes
"error: nothing to do".  Some tests in t3404 check this value, so they
are updated to fit 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>
---
The changes are due to conflict resolution, no real changes otherwise.

 builtin/rebase--helper.c      |  12 +++-
 git-rebase--interactive.sh    |  53 ++---------------
 git-rebase.sh                 |   2 +-
 sequencer.c                   | 104 ++++++++++++++++++++++++++++++++++
 sequencer.h                   |   4 ++
 t/t3404-rebase-interactive.sh |   2 +-
 6 files changed, 124 insertions(+), 53 deletions(-)

diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index bed3dd2b95..01b3333958 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 that begin with squash!/fixup!")),
 		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 f2cda5593d..0104c0ad01 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -31,6 +31,7 @@
 #include "commit-slab.h"
 #include "alias.h"
 #include "commit-reach.h"
+#include "rebase-interactive.h"
 
 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
 
@@ -54,6 +55,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
@@ -4672,6 +4676,106 @@ 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);
+	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 -1;
+
+	if (autosquash && rearrange_squash())
+		return -1;
+
+	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)) {
+		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);
+
+		return error(_("nothing to do"));
+	}
+
+	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 -1;
+	}
+
+	if (copy_file(rebase_path_todo_backup(), todo_file, 0666))
+		return error(_("could not copy '%s' to '%s'."), todo_file,
+			     rebase_path_todo_backup());
+
+	if (transform_todos(flags | TODO_LIST_SHORTEN_IDS))
+		return error(_("could not transform the todo list"));
+
+	strbuf_reset(buf);
+
+	if (launch_sequence_editor(todo_file, buf, NULL)) {
+		apply_autostash(opts);
+		sequencer_remove_state(opts);
+		todo_list_release(&todo_list);
+
+		return -1;
+	}
+
+	strbuf_stripspace(buf, 1);
+	if (buf->len == 0) {
+		apply_autostash(opts);
+		sequencer_remove_state(opts);
+		todo_list_release(&todo_list);
+
+		return error(_("nothing to do"));
+	}
+
+	todo_list_release(&todo_list);
+
+	if (check_todo_list()) {
+		checkout_onto(opts, onto_name, onto, orig_head);
+		return -1;
+	}
+
+	if (transform_todos(flags & ~(TODO_LIST_SHORTEN_IDS)))
+		return error(_("could not transform the todo list"));
+
+	if (opts->allow_ff && skip_unnecessary_picks(&oid))
+		return error(_("could not skip unnecessary pick commands"));
+
+	if (checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_head))
+		return -1;
+;
+	if (require_clean_work_tree("rebase", "", 1, 1))
+		return -1;
+
+	return sequencer_continue(opts);
+}
+
 struct subject2item_entry {
 	struct hashmap_entry entry;
 	int i;
diff --git a/sequencer.h b/sequencer.h
index 6b0885db57..d51fe2c576 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -97,6 +97,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[];
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index a7fc3cd5be..d60e59ecdb 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -76,7 +76,7 @@ test_expect_success 'rebase --keep-empty' '
 '
 
 cat > expect <<EOF
-Nothing to do
+error: nothing to do
 EOF
 
 test_expect_success 'rebase -i with empty HEAD' '
-- 
2.19.0


  parent reply index

Thread overview: 193+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-02 10:57 [GSoC][PATCH v2 0/7] rebase -i: rewrite some parts " Alban Gruin
2018-07-02 10:57 ` [GSoC][PATCH v2 1/7] sequencer: make two functions and an enum from sequencer.c public Alban Gruin
2018-07-03 20:20   ` Junio C Hamano
2018-07-05 15:35     ` Alban Gruin
2018-07-02 10:57 ` [GSoC][PATCH v2 2/7] rebase--interactive: rewrite append_todo_help() in C Alban Gruin
2018-07-03 20:29   ` Junio C Hamano
2018-07-02 10:57 ` [GSoC][PATCH v2 3/7] editor: add a function to launch the sequence editor Alban Gruin
2018-07-03 20:32   ` Junio C Hamano
2018-07-02 10:57 ` [GSoC][PATCH v2 4/7] rebase-interactive: rewrite the edit-todo functionality in C Alban Gruin
2018-07-02 10:57 ` [GSoC][PATCH v2 5/7] sequencer: add a new function to silence a command, except if it fails Alban Gruin
2018-07-03 20:36   ` Junio C Hamano
2018-07-02 10:57 ` [GSoC][PATCH v2 6/7] rebase -i: rewrite setup_reflog_action() in C Alban Gruin
2018-07-03 20:37   ` Junio C Hamano
2018-07-06 12:58     ` Johannes Schindelin
2018-07-06 15:02       ` Junio C Hamano
2018-07-06 18:54         ` Johannes Schindelin
2018-07-06 21:55           ` Junio C Hamano
2018-07-07 16:40             ` Junio C Hamano
2018-07-02 10:57 ` [GSoC][PATCH v2 7/7] rebase -i: rewrite checkout_onto() " Alban Gruin
2018-07-10 12:15 ` [GSoC][PATCH v3 00/13] rebase -i: rewrite some parts " Alban Gruin
2018-07-10 12:15   ` [GSoC][PATCH v3 01/13] sequencer: make two functions and an enum from sequencer.c public Alban Gruin
2018-07-10 17:53     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 02/13] rebase--interactive: rewrite append_todo_help() in C Alban Gruin
2018-07-10 12:21     ` Alban Gruin
2018-07-10 17:56     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 03/13] editor: add a function to launch the sequence editor Alban Gruin
2018-07-10 12:23     ` Alban Gruin
2018-07-10 17:58     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 04/13] rebase-interactive: rewrite the edit-todo functionality in C Alban Gruin
2018-07-10 18:00     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 05/13] sequencer: add a new function to silence a command, except if it fails Alban Gruin
2018-07-10 18:13     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 06/13] rebase -i: rewrite setup_reflog_action() in C Alban Gruin
2018-07-10 18:20     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 07/13] rebase -i: rewrite checkout_onto() " Alban Gruin
2018-07-10 18:22     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 08/13] sequencer: refactor append_todo_help() to write its message to a buffer Alban Gruin
2018-07-10 18:30     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 09/13] sequencer: change the way skip_unnecessary_picks() returns its result Alban Gruin
2018-07-10 18:38     ` Junio C Hamano
2018-07-10 18:52     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 10/13] rebase--interactive: rewrite complete_action() in C Alban Gruin
2018-07-10 22:33     ` Junio C Hamano
2018-07-11 14:25       ` Alban Gruin
2018-07-10 12:15   ` [GSoC][PATCH v3 11/13] rebase--interactive: remove unused modes and functions Alban Gruin
2018-07-10 22:36     ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 12/13] rebase -i: implement the logic to initialize the variable $revision in C Alban Gruin
2018-07-12 18:15     ` Junio C Hamano
2018-07-12 18:24       ` Junio C Hamano
2018-07-10 12:15   ` [GSoC][PATCH v3 13/13] rebase -i: rewrite the rest of init_revisions_and_shortrevisions " Alban Gruin
2018-07-24 16:32   ` [GSoC][PATCH v4 00/20] rebase -i: rewrite " Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 01/20] sequencer: make two functions and an enum from sequencer.c public Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 02/20] rebase -i: rewrite append_todo_help() in C Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 03/20] editor: add a function to launch the sequence editor Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 04/20] rebase -i: rewrite the edit-todo functionality in C Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 05/20] sequencer: add a new function to silence a command, except if it fails Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 06/20] rebase -i: rewrite setup_reflog_action() in C Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 07/20] rebase -i: rewrite checkout_onto() " Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 08/20] sequencer: refactor append_todo_help() to write its message to a buffer Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 09/20] sequencer: change the way skip_unnecessary_picks() returns its result Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 10/20] t3404: todo list with commented-out commands only aborts Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 11/20] rebase -i: rewrite complete_action() in C Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 12/20] rebase -i: remove unused modes and functions Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 13/20] rebase -i: implement the logic to initialize $revisions in C Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() " Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 15/20] rebase -i: rewrite write_basic_state() " Alban Gruin
2018-07-30 18:25       ` SZEDER Gábor
2018-07-30 22:11         ` Alban Gruin
2018-07-31 12:11         ` [GSoC][PATCH v4] fixup! " Alban Gruin
2018-07-31 15:23           ` Junio C Hamano
2018-07-31 15:59             ` Alban Gruin
2018-07-31 16:04               ` Junio C Hamano
2018-07-31 17:25                 ` Junio C Hamano
2018-08-03 13:26         ` [GSoC][PATCH v4 15/20] " Jeff King
2018-07-24 16:32     ` [GSoC][PATCH v4 16/20] rebase -i: rewrite init_basic_state() " Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 17/20] rebase -i: implement the main part of interactive rebase as a builtin Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in C Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 19/20] rebase -i: remove git-rebase--interactive.sh Alban Gruin
2018-07-24 16:32     ` [GSoC][PATCH v4 20/20] rebase -i: move rebase--helper modes to rebase--interactive Alban Gruin
2018-07-25 18:45     ` [GSoC][PATCH v4 00/20] rebase -i: rewrite in C Stefan Beller
2018-07-25 22:43     ` Junio C Hamano
2018-07-31 17:59     ` [GSoC][PATCH v5 " Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 01/20] sequencer: make two functions and an enum from sequencer.c public Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 02/20] rebase -i: rewrite append_todo_help() in C Alban Gruin
2018-08-07 13:57         ` Phillip Wood
2018-08-07 15:25           ` Christian Couder
2018-08-07 16:15             ` Phillip Wood
2018-08-07 16:28               ` Christian Couder
2018-08-07 17:31                 ` Phillip Wood
2018-08-08 15:16           ` Alban Gruin
2018-08-08 16:00             ` Phillip Wood
2018-07-31 17:59       ` [GSoC][PATCH v5 03/20] editor: add a function to launch the sequence editor Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 04/20] rebase -i: rewrite the edit-todo functionality in C Alban Gruin
2018-08-07 14:00         ` Phillip Wood
2018-08-08 15:17           ` Alban Gruin
2018-08-08 16:04             ` Phillip Wood
2018-08-09 13:30               ` Alban Gruin
2018-08-09 15:35                 ` Phillip Wood
2018-08-09 16:09                   ` Phillip Wood
2018-07-31 17:59       ` [GSoC][PATCH v5 05/20] sequencer: add a new function to silence a command, except if it fails Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 06/20] rebase -i: rewrite setup_reflog_action() in C Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 07/20] rebase -i: rewrite checkout_onto() " Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 08/20] sequencer: refactor append_todo_help() to write its message to a buffer Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 09/20] sequencer: change the way skip_unnecessary_picks() returns its result Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 10/20] t3404: todo list with commented-out commands only aborts Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 11/20] rebase -i: rewrite complete_action() in C Alban Gruin
2018-08-09 14:22         ` Phillip Wood
2018-08-09 17:00           ` Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 12/20] rebase -i: remove unused modes and functions Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 13/20] rebase -i: implement the logic to initialize $revisions in C Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() " Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 15/20] rebase -i: rewrite write_basic_state() " Alban Gruin
2018-07-31 17:59       ` [GSoC][PATCH v5 16/20] rebase -i: rewrite init_basic_state() " Alban Gruin
2018-07-31 18:00       ` [GSoC][PATCH v5 17/20] rebase -i: implement the main part of interactive rebase as a builtin Alban Gruin
2018-07-31 18:00       ` [GSoC][PATCH v5 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in C Alban Gruin
2018-07-31 18:00       ` [GSoC][PATCH v5 19/20] rebase -i: remove git-rebase--interactive.sh Alban Gruin
2018-07-31 18:00       ` [GSoC][PATCH v5 20/20] rebase -i: move rebase--helper modes to rebase--interactive Alban Gruin
2018-07-31 19:28       ` [GSoC][PATCH v5 00/20] rebase -i: rewrite in C Junio C Hamano
2018-08-10 16:51       ` [GSoC][PATCH v6 " Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 01/20] sequencer: make three functions and an enum from sequencer.c public Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 02/20] rebase -i: rewrite append_todo_help() in C Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 03/20] editor: add a function to launch the sequence editor Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 04/20] rebase -i: rewrite the edit-todo functionality in C Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 05/20] sequencer: add a new function to silence a command, except if it fails Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 06/20] rebase -i: rewrite setup_reflog_action() in C Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 07/20] rebase -i: rewrite checkout_onto() " Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 08/20] sequencer: refactor append_todo_help() to write its message to a buffer Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 09/20] sequencer: change the way skip_unnecessary_picks() returns its result Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 10/20] t3404: todo list with commented-out commands only aborts Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 11/20] rebase -i: rewrite complete_action() in C Alban Gruin
2018-08-10 19:25           ` Junio C Hamano
2018-08-10 19:36             ` Alban Gruin
2018-08-10 20:27               ` Junio C Hamano
2018-08-10 21:15                 ` Alban Gruin
2018-08-17 13:16           ` Phillip Wood
2018-08-10 16:51         ` [GSoC][PATCH v6 12/20] rebase -i: remove unused modes and functions Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 13/20] rebase -i: implement the logic to initialize $revisions in C Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() " Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 15/20] rebase -i: rewrite write_basic_state() " Alban Gruin
2018-08-17 13:27           ` Phillip Wood
2018-08-23 21:27             ` Johannes Schindelin
2018-08-10 16:51         ` [GSoC][PATCH v6 16/20] rebase -i: rewrite init_basic_state() " Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 17/20] rebase -i: implement the main part of interactive rebase as a builtin Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in C Alban Gruin
2018-08-22 21:14           ` Johannes Schindelin
2018-08-22 21:30             ` Junio C Hamano
2018-08-23 21:08               ` Johannes Schindelin
2018-08-10 16:51         ` [GSoC][PATCH v6 19/20] rebase -i: remove git-rebase--interactive.sh Alban Gruin
2018-08-10 16:51         ` [GSoC][PATCH v6 20/20] rebase -i: move rebase--helper modes to rebase--interactive Alban Gruin
2018-08-13 16:06         ` [GSoC][PATCH v6 00/20] rebase -i: rewrite in C Duy Nguyen
2018-08-13 20:47           ` Alban Gruin
2018-08-28 12:10         ` [GSoC][PATCH v7 " Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 01/20] sequencer: make three functions and an enum from sequencer.c public Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 02/20] rebase -i: rewrite append_todo_help() in C Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 03/20] editor: add a function to launch the sequence editor Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 04/20] rebase -i: rewrite the edit-todo functionality in C Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 05/20] sequencer: add a new function to silence a command, except if it fails Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 06/20] rebase -i: rewrite setup_reflog_action() in C Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 07/20] rebase -i: rewrite checkout_onto() " Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 08/20] sequencer: refactor append_todo_help() to write its message to a buffer Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 09/20] sequencer: change the way skip_unnecessary_picks() returns its result Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 10/20] t3404: todo list with commented-out commands only aborts Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 11/20] rebase -i: rewrite complete_action() in C Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 12/20] rebase -i: remove unused modes and functions Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 13/20] rebase -i: implement the logic to initialize $revisions in C Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() " Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 15/20] rebase -i: rewrite write_basic_state() " Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 16/20] rebase -i: rewrite init_basic_state() " Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 17/20] rebase -i: implement the main part of interactive rebase as a builtin Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in C Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 19/20] rebase -i: remove git-rebase--interactive.sh Alban Gruin
2018-08-28 12:10           ` [GSoC][PATCH v7 20/20] rebase -i: move rebase--helper modes to rebase--interactive Alban Gruin
2018-09-27 21:55           ` [GSoC][PATCH v8 00/20] rebase -i: rewrite in C Alban Gruin
2018-09-27 21:55             ` [GSoC][PATCH v8 01/20] sequencer: make three functions and an enum from sequencer.c public Alban Gruin
2018-09-27 21:55             ` [GSoC][PATCH v8 02/20] rebase -i: rewrite append_todo_help() in C Alban Gruin
2018-09-27 21:55             ` [GSoC][PATCH v8 03/20] editor: add a function to launch the sequence editor Alban Gruin
2018-09-27 21:55             ` [GSoC][PATCH v8 04/20] rebase -i: rewrite the edit-todo functionality in C Alban Gruin
2018-09-27 21:55             ` [GSoC][PATCH v8 05/20] sequencer: add a new function to silence a command, except if it fails Alban Gruin
2018-09-27 21:55             ` [GSoC][PATCH v8 06/20] rebase -i: rewrite setup_reflog_action() in C Alban Gruin
2018-09-27 21:55             ` [GSoC][PATCH v8 07/20] rebase -i: rewrite checkout_onto() " Alban Gruin
2018-09-27 21:55             ` [GSoC][PATCH v8 08/20] sequencer: refactor append_todo_help() to write its message to a buffer Alban Gruin
2018-09-27 21:55             ` [GSoC][PATCH v8 09/20] sequencer: change the way skip_unnecessary_picks() returns its result Alban Gruin
2018-09-27 21:56             ` [GSoC][PATCH v8 10/20] t3404: todo list with commented-out commands only aborts Alban Gruin
2018-09-27 21:56             ` Alban Gruin [this message]
2018-09-27 21:56             ` [GSoC][PATCH v8 12/20] rebase -i: remove unused modes and functions Alban Gruin
2018-09-27 21:56             ` [GSoC][PATCH v8 13/20] rebase -i: implement the logic to initialize $revisions in C Alban Gruin
2018-09-27 21:56             ` [GSoC][PATCH v8 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() " Alban Gruin
2018-09-27 21:56             ` [GSoC][PATCH v8 15/20] rebase -i: rewrite write_basic_state() " Alban Gruin
2018-09-27 21:56             ` [GSoC][PATCH v8 16/20] rebase -i: rewrite init_basic_state() " Alban Gruin
2018-09-27 21:56             ` [GSoC][PATCH v8 17/20] rebase -i: implement the main part of interactive rebase as a builtin Alban Gruin
2018-09-27 21:56             ` [GSoC][PATCH v8 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in C Alban Gruin
2018-09-27 21:56             ` [GSoC][PATCH v8 19/20] rebase -i: remove git-rebase--interactive.sh Alban Gruin
2018-09-27 21:56             ` [GSoC][PATCH v8 20/20] rebase -i: move rebase--helper modes to rebase--interactive Alban Gruin

Reply instructions:

You may reply publically 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=20180927215610.32210-12-alban.gruin@gmail.com \
    --to=alban.gruin@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=predatoramigo@gmail.com \
    --cc=sbeller@google.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

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git