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 v4 14/20] rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C
Date: Tue, 24 Jul 2018 18:32:15 +0200 [thread overview]
Message-ID: <20180724163221.15201-15-alban.gruin@gmail.com> (raw)
In-Reply-To: <20180724163221.15201-1-alban.gruin@gmail.com>
This rewrites the part of init_revisions_and_shortrevisions() needed by
`--complete-action` (which initialize $shortrevisions) from shell to C.
When `upstream` is empty, it means that the user launched a `rebase
--root`, and `onto` contains the ID of an empty commit. As a range
between an empty commit and `head` is not really meaningful, `onto` is
not used to initialize `shortrevisions` in this case.
The corresponding arguments passed to `--complete-action` are then
dropped, and init_revisions_and_shortrevisions() is stripped from
git-rebase--interactive.sh
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
---
builtin/rebase--helper.c | 40 ++++++++++++++++++++++++++++++++------
git-rebase--interactive.sh | 27 ++++---------------------
2 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index 15fa556f65..c4a4c5cfbb 100644
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@ -10,7 +10,7 @@ static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto")
static int get_revision_ranges(const char *upstream, const char *onto,
const char **head_hash,
- char **revisions)
+ char **revisions, char **shortrevisions)
{
const char *base_rev = upstream ? upstream : onto;
struct object_id orig_head;
@@ -19,7 +19,25 @@ static int get_revision_ranges(const char *upstream, const char *onto,
return error(_("no HEAD?"));
*head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ);
- *revisions = xstrfmt("%s...%s", base_rev, *head_hash);
+
+ if (revisions)
+ *revisions = xstrfmt("%s...%s", base_rev, *head_hash);
+ if (shortrevisions) {
+ const char *shorthead;
+
+ shorthead = find_unique_abbrev(&orig_head, DEFAULT_ABBREV);
+
+ if (upstream) {
+ const char *shortrev;
+ struct object_id rev_oid;
+
+ get_oid(base_rev, &rev_oid);
+ shortrev = find_unique_abbrev(&rev_oid, DEFAULT_ABBREV);
+
+ *shortrevisions = xstrfmt("%s..%s", shortrev, shorthead);
+ } else
+ *shortrevisions = xstrdup(shorthead);
+ }
return 0;
}
@@ -116,7 +134,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
if (!upstream && squash_onto)
write_file(path_squash_onto(), "%s\n", squash_onto);
- ret = get_revision_ranges(upstream, onto, &head_hash, &revisions);
+ ret = get_revision_ranges(upstream, onto, &head_hash, &revisions, NULL);
if (ret)
return ret;
@@ -145,9 +163,19 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
return !!edit_todo_list(flags);
if (command == PREPARE_BRANCH && argc == 2)
return !!prepare_branch_to_be_rebased(&opts, argv[1]);
- if (command == COMPLETE_ACTION && argc == 6)
- return !!complete_action(&opts, flags, argv[1], argv[2], argv[3],
- argv[4], argv[5], autosquash);
+ if (command == COMPLETE_ACTION && argc == 3) {
+ char *shortrevisions = NULL;
+
+ ret = get_revision_ranges(upstream, onto, &head_hash, NULL, &shortrevisions);
+ if (ret)
+ return ret;
+
+ ret = complete_action(&opts, flags, shortrevisions, argv[1], onto,
+ head_hash, argv[2], autosquash);
+
+ free(shortrevisions);
+ return !!ret;
+ }
usage_with_options(builtin_rebase_helper_usage, options);
}
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 4ca47aed1e..08e9a21c2f 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -60,23 +60,6 @@ init_basic_state () {
write_basic_state
}
-init_revisions_and_shortrevisions () {
- shorthead=$(git rev-parse --short $orig_head)
- shortonto=$(git rev-parse --short $onto)
- if test -z "$rebase_root"
- # this is now equivalent to ! -z "$upstream"
- then
- shortupstream=$(git rev-parse --short $upstream)
- revisions=$upstream...$orig_head
- shortrevisions=$shortupstream..$shorthead
- else
- revisions=$onto...$orig_head
- shortrevisions=$shorthead
- test -z "$squash_onto" ||
- echo "$squash_onto" >"$state_dir"/squash-onto
- fi
-}
-
git_rebase__interactive () {
initiate_action "$action"
ret=$?
@@ -87,8 +70,6 @@ git_rebase__interactive () {
git rebase--helper --prepare-branch "$switch_to" ${verbose:+--verbose}
init_basic_state
- init_revisions_and_shortrevisions
-
git rebase--helper --make-script ${keep_empty:+--keep-empty} \
${rebase_merges:+--rebase-merges} \
${rebase_cousins:+--rebase-cousins} \
@@ -97,8 +78,8 @@ git_rebase__interactive () {
${restrict_revision:+--restrict-revision ^"$restrict_revision"} >"$todo" ||
die "$(gettext "Could not generate todo list")"
- 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}
+ exec git rebase--helper --complete-action "$onto_name" "$cmd" \
+ $allow_empty_message ${autosquash:+--autosquash} ${verbose:+--verbose} \
+ ${keep_empty:+--keep-empty} ${force_rebase:+--no-ff} \
+ ${upstream:+--upstream "$upstream"} ${onto:+--onto "$onto"}
}
--
2.18.0
next prev parent reply other threads:[~2018-07-24 16:34 UTC|newest]
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 in C 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 ` Alban Gruin [this message]
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 ` [GSoC][PATCH v8 11/20] rebase -i: rewrite complete_action() in C Alban Gruin
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 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=20180724163221.15201-15-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
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).