From: Phillip Wood <phillip.wood123@gmail.com>
To: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, phillip.wood@dunelm.org.uk,
liu.denton@gmail.com, gitster@pobox.com, plroskin@gmail.com,
alban.gruin@gmail.com, szeder.dev@gmail.com, jrnieder@gmail.com,
emilyshaffer@google.com, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH v4 03/19] rebase (interactive-backend): make --keep-empty the default
Date: Sun, 9 Feb 2020 15:59:40 +0000 [thread overview]
Message-ID: <805e3edd-d479-16b8-c67f-d8ea34176389@gmail.com> (raw)
In-Reply-To: <179f82ab83e669ca8da7ce999607cae584bc18df.1579155273.git.gitgitgadget@gmail.com>
Hi Elijah
On 16/01/2020 06:14, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
>
> Different rebase backends have different treatment for commits which
> start empty (i.e. have no changes relative to their parent), and the
> --keep-empty option was added at some point to allow adjusting behavior
> for the interactive backend.
--keep-empty was introduced by 90e1818f9a ("git-rebase: add keep_empty
flag", 2012-04-20) and was respected for am based rebases as well
(although the implementation was broken if there were any conflicts)
> The handling of commits which start empty
> is actually quite similar to commit b00bf1c9a8dd (git-rebase: make
> --allow-empty-message the default, 2018-06-27), which pointed out that
> the behavior for various backends is often more happenstance than
> design. The specific change made in that commit is actually quite
> relevant as well and much of the logic there directly applies here.
>
> It makes a lot of sense in 'git commit' to error out on the creation of
> empty commits, unless an override flag is provided. However, once
> someone determines that there is a rare case that merits using the
> manual override to create such a commit, it is somewhere between
> annoying and harmful to have to take extra steps to keep such
> intentional commits around. Granted, empty commits are quite rare,
> which is why handling of them doesn't get considered much and folks tend
> to defer to existing (accidental) behavior and assume there was a reason
> for it, leading them to just add flags (--keep-empty in this case) that
> allow them to override the bad defaults. Fix the interactive backend so
> that --keep-empty is the default, much like we did with
> --allow-empty-message. The am backend should also be fixed to have
> --keep-empty semantics for commits that start empty, but that is not
> included in this patch other than a testcase documenting the failure.
The detailed commit message is great, however I think it would be good
to point out that this changes things so that --no-keep-empty is parsed
but does nothing - it is no longer possible to get that behavior. I'm
not entirely sure about making --keep-empty hidden given that the am
backend has a different behavior without it but as we're changing the
default backend it probably does not matter and it looks like
--keep-empty combined with an am specific option will still error out
which is good.
Overall I like this change and it simplifies the implementation which is
nice. Hopefully no one was relying on --no-keep-empty
> Note that there was one test in t3421 which appears to have been written
> expecting --keep-empty to not be the default as correct behavior. This
> test was introduced in commit 00b8be5a4d38 ("add tests for rebasing of
> empty commits", 2013-06-06), which was part of a series focusing on
> rebase topology and which had an interesting original cover letter at
> https://lore.kernel.org/git/1347949878-12578-1-git-send-email-martinvonz@gmail.com/
> which noted
> Your input especially appreciated on whether you agree with the
> intent of the test cases.
> and then went into a long example about how one of the many tests added
> had several questions about whether it was correct. As such, I believe
> most the tests in that series were about testing rebase topology with as
> many different flags as possible and were not trying to state in general
> how those flags should behave otherwise.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> Documentation/git-rebase.txt | 24 ++++++-----
> builtin/rebase.c | 28 ++++++++----
> rebase-interactive.c | 7 +--
> rebase-interactive.h | 2 +-
> sequencer.c | 20 +++------
> sequencer.h | 2 +-
> t/t3421-rebase-topology-linear.sh | 16 +++----
> t/t3424-rebase-empty.sh | 72 +++++++++++++++++++++++++++++++
> t/t3427-rebase-subtree.sh | 12 +++---
> 9 files changed, 128 insertions(+), 55 deletions(-)
> create mode 100755 t/t3424-rebase-empty.sh
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index c83be7ffc2..1d19542d79 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -259,10 +259,13 @@ See also INCOMPATIBLE OPTIONS below.
> unchanged as a result.
>
> --keep-empty::
> - Keep the commits that do not change anything from its
> - parents in the result.
> + No-op. Rebasing commits that started empty (had no change
> + relative to their parent) used to fail and this option would
> + override that behavior, allowing commits with empty changes to
> + be rebased. Now commits with no changes do not cause rebasing
> + to halt.
Maybe mention that --no-keep-empty is no longer respected?
> -See also INCOMPATIBLE OPTIONS below.
> +See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below.
>
> --allow-empty-message::
> No-op. Rebasing commits with an empty message used to fail
> @@ -577,15 +580,14 @@ There are some subtle differences how the backends behave.
> Empty commits
> ~~~~~~~~~~~~~
>
> -The am backend drops any "empty" commits, regardless of whether the
> -commit started empty (had no changes relative to its parent to
> -start with) or ended empty (all changes were already applied
> -upstream in other commits).
> +The am backend unfortunately drops intentionally empty commits, i.e.
> +commits that started empty, though these are rare in practice. It
> +also drops commits that become empty and has no option for controlling
> +this behavior.
>
> -The interactive backend drops commits by default that
> -started empty and halts if it hits a commit that ended up empty.
> -The `--keep-empty` option exists for the interactive backend to allow
> -it to keep commits that started empty.
> +The interactive backend keeps intentionally empty commits.
> +Unfortunately, it always halts whenever it runs across a commit that
> +becomes empty, even when the rebase is not explicitly interactive.
>
> Directory rename detection
> ~~~~~~~~~~~~~~~~~~~~~~~~~~
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index faa4e0d406..537b3241ce 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -77,7 +77,6 @@ struct rebase_options {
> const char *action;
> int signoff;
> int allow_rerere_autoupdate;
> - int keep_empty;
> int autosquash;
> char *gpg_sign_opt;
> int autostash;
> @@ -375,7 +374,6 @@ static int run_rebase_interactive(struct rebase_options *opts,
>
> git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
>
> - flags |= opts->keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
> flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
> flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
> flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
> @@ -439,6 +437,17 @@ static int run_rebase_interactive(struct rebase_options *opts,
> return ret;
> }
>
> +static int parse_opt_keep_empty(const struct option *opt, const char *arg,
> + int unset)
> +{
> + struct rebase_options *opts = opt->value;
> +
> + BUG_ON_OPT_ARG(arg);
> +
> + opts->type = REBASE_INTERACTIVE;
> + return 0;
> +}
This doesn't seem to handle --no-keep-empty (but looking through the
patch that seems to be intentional)
> static const char * const builtin_rebase_interactive_usage[] = {
> N_("git rebase--interactive [<options>]"),
> NULL
> @@ -452,7 +461,10 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
> struct option options[] = {
> OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
> REBASE_FORCE),
> - OPT_BOOL(0, "keep-empty", &opts.keep_empty, N_("keep empty commits")),
> + { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
> + N_("(DEPRECATED) keep empty commits"),
> + PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
> + parse_opt_keep_empty },
> OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message,
> N_("allow commits with empty messages"),
> PARSE_OPT_HIDDEN),
> @@ -1145,7 +1157,6 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
> opts->allow_rerere_autoupdate ?
> opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
> "--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
> - add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
> add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
> add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
> add_var(&script_snippet, "cmd", opts->cmd);
> @@ -1483,8 +1494,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> "ignoring them"),
> REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
> OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
> - OPT_BOOL('k', "keep-empty", &options.keep_empty,
> - N_("preserve empty commits during rebase")),
> + { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
> + N_("(DEPRECATED) keep empty commits"),
> + PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
> + parse_opt_keep_empty },
> OPT_BOOL(0, "autosquash", &options.autosquash,
> N_("move commits that begin with "
> "squash!/fixup! under -i")),
> @@ -1747,9 +1760,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> if (!(options.flags & REBASE_NO_QUIET))
> argv_array_push(&options.git_am_opts, "-q");
>
> - if (options.keep_empty)
> - imply_interactive(&options, "--keep-empty");
> -
> if (gpg_sign) {
> free(options.gpg_sign_opt);
> options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
> diff --git a/rebase-interactive.c b/rebase-interactive.c
> index aa18ae82b7..7e7b4061bf 100644
> --- a/rebase-interactive.c
> +++ b/rebase-interactive.c
> @@ -28,7 +28,7 @@ static enum missing_commit_check_level get_missing_commit_check_level(void)
> return MISSING_COMMIT_CHECK_IGNORE;
> }
>
> -void append_todo_help(unsigned keep_empty, int command_count,
> +void append_todo_help(int command_count,
> const char *shortrevisions, const char *shortonto,
> struct strbuf *buf)
> {
> @@ -80,11 +80,6 @@ void append_todo_help(unsigned keep_empty, int command_count,
> "the rebase will be aborted.\n\n");
>
> strbuf_add_commented_lines(buf, msg, strlen(msg));
> -
> - if (!keep_empty) {
> - msg = _("Note that empty commits are commented out");
> - strbuf_add_commented_lines(buf, msg, strlen(msg));
> - }
> }
>
> int edit_todo_list(struct repository *r, struct todo_list *todo_list,
> diff --git a/rebase-interactive.h b/rebase-interactive.h
> index 44dbb06311..05354ca341 100644
> --- a/rebase-interactive.h
> +++ b/rebase-interactive.h
> @@ -5,7 +5,7 @@ struct strbuf;
> struct repository;
> struct todo_list;
>
> -void append_todo_help(unsigned keep_empty, int command_count,
> +void append_todo_help(int command_count,
> const char *shortrevisions, const char *shortonto,
> struct strbuf *buf);
> int edit_todo_list(struct repository *r, struct todo_list *todo_list,
> diff --git a/sequencer.c b/sequencer.c
> index b9dbf1adb0..c21fc202b1 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -1489,7 +1489,7 @@ static int allow_empty(struct repository *r,
> struct replay_opts *opts,
> struct commit *commit)
> {
> - int index_unchanged, empty_commit;
> + int index_unchanged, originally_empty;
>
> /*
> * Three cases:
> @@ -1513,10 +1513,10 @@ static int allow_empty(struct repository *r,
> if (opts->keep_redundant_commits)
> return 1;
>
> - empty_commit = is_original_commit_empty(commit);
> - if (empty_commit < 0)
> - return empty_commit;
> - if (!empty_commit)
> + originally_empty = is_original_commit_empty(commit);
> + if (originally_empty < 0)
> + return originally_empty;
> + if (!originally_empty)
> return 0;
> else
> return 1;
> @@ -4566,7 +4566,6 @@ static int make_script_with_merges(struct pretty_print_context *pp,
> struct rev_info *revs, struct strbuf *out,
> unsigned flags)
> {
> - int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
> int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS;
> int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO;
> struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT;
> @@ -4629,8 +4628,6 @@ static int make_script_with_merges(struct pretty_print_context *pp,
> if (!to_merge) {
> /* non-merge commit: easy case */
> strbuf_reset(&buf);
> - if (!keep_empty && is_empty)
> - strbuf_addf(&buf, "%c ", comment_line_char);
> strbuf_addf(&buf, "%s %s %s", cmd_pick,
> oid_to_hex(&commit->object.oid),
> oneline.buf);
> @@ -4797,7 +4794,6 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
> struct pretty_print_context pp = {0};
> struct rev_info revs;
> struct commit *commit;
> - int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
> const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick";
> int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
>
> @@ -4833,12 +4829,10 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
> return make_script_with_merges(&pp, &revs, out, flags);
>
> while ((commit = get_revision(&revs))) {
> - int is_empty = is_original_commit_empty(commit);
> + int is_empty = is_original_commit_empty(commit);
>
> if (!is_empty && (commit->object.flags & PATCHSAME))
> continue;
> - if (!keep_empty && is_empty)
> - strbuf_addf(out, "%c ", comment_line_char);
> strbuf_addf(out, "%s %s ", insn,
> oid_to_hex(&commit->object.oid));
> pretty_print_commit(&pp, commit, out);
> @@ -4975,7 +4969,7 @@ int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
>
> todo_list_to_strbuf(r, todo_list, &buf, num, flags);
> if (flags & TODO_LIST_APPEND_TODO_HELP)
> - append_todo_help(flags & TODO_LIST_KEEP_EMPTY, count_commands(todo_list),
> + append_todo_help(count_commands(todo_list),
> shortrevisions, shortonto, &buf);
>
> res = write_message(buf.buf, buf.len, file, 0);
> diff --git a/sequencer.h b/sequencer.h
> index 9f9ae291e3..c165e0ff25 100644
> --- a/sequencer.h
> +++ b/sequencer.h
> @@ -132,7 +132,7 @@ int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
> int sequencer_skip(struct repository *repo, struct replay_opts *opts);
> int sequencer_remove_state(struct replay_opts *opts);
>
> -#define TODO_LIST_KEEP_EMPTY (1U << 0)
> +/* #define TODO_LIST_KEEP_EMPTY (1U << 0) */ /* No longer used */
> #define TODO_LIST_SHORTEN_IDS (1U << 1)
> #define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
> #define TODO_LIST_REBASE_MERGES (1U << 3)
> diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
> index 325072b0a3..57334dca7e 100755
> --- a/t/t3421-rebase-topology-linear.sh
> +++ b/t/t3421-rebase-topology-linear.sh
> @@ -205,17 +205,17 @@ test_expect_success 'setup of linear history for empty commit tests' '
> test_run_rebase () {
> result=$1
> shift
> - test_expect_$result "rebase $* drops empty commit" "
> + test_expect_$result "rebase $* keeps begin-empty commits" "
> reset_rebase &&
> - git rebase $* c l &&
> - test_cmp_rev c HEAD~2 &&
> - test_linear_range 'd l' c..
> + git rebase $* j l &&
> + test_cmp_rev c HEAD~4 &&
> + test_linear_range 'j d k l' c..
> "
> }
> -test_run_rebase success ''
> +test_run_rebase failure ''
> test_run_rebase success -m
> test_run_rebase success -i
> -test_have_prereq !REBASE_P || test_run_rebase success -p
> +test_have_prereq !REBASE_P || test_run_rebase failure -p
>
> test_run_rebase () {
> result=$1
> @@ -230,7 +230,7 @@ test_run_rebase () {
> test_run_rebase success ''
> test_run_rebase success -m
> test_run_rebase success -i
> -test_have_prereq !REBASE_P || test_run_rebase failure -p
> +test_have_prereq !REBASE_P || test_run_rebase success -p
>
> test_run_rebase () {
> result=$1
> @@ -245,7 +245,7 @@ test_run_rebase () {
> test_run_rebase success ''
> test_run_rebase success -m
> test_run_rebase success -i
> -test_have_prereq !REBASE_P || test_run_rebase failure -p
> +test_have_prereq !REBASE_P || test_run_rebase success -p
> test_run_rebase success --rebase-merges
>
> # m
> diff --git a/t/t3424-rebase-empty.sh b/t/t3424-rebase-empty.sh
> new file mode 100755
> index 0000000000..22d97e143b
> --- /dev/null
> +++ b/t/t3424-rebase-empty.sh
> @@ -0,0 +1,72 @@
> +#!/bin/sh
> +
> +test_description='git rebase of commits that start or become empty'
> +
> +. ./test-lib.sh
> +
> +test_expect_success 'setup test repository' '
> + test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
> + test_write_lines A B C D E F G H I J >letters &&
> + git add numbers letters &&
> + git commit -m A &&
> +
> + git branch upstream &&
> + git branch localmods &&
> +
> + git checkout upstream &&
> + test_write_lines A B C D E >letters &&
> + git add letters &&
> + git commit -m B &&
> +
> + test_write_lines 1 2 3 4 five 6 7 8 9 ten >numbers &&
> + git add numbers &&
> + git commit -m C &&
> +
> + git checkout localmods &&
> + test_write_lines 1 2 3 4 five 6 7 8 9 10 >numbers &&
> + git add numbers &&
> + git commit -m C2 &&
> +
> + git commit --allow-empty -m D &&
> +
> + test_write_lines A B C D E >letters &&
> + git add letters &&
> + git commit -m "Five letters ought to be enough for anybody"
> +'
> +
> +test_expect_failure 'rebase (am-backend) with a variety of empty commits' '
> + test_when_finished "git rebase --abort" &&
> + git checkout -B testing localmods &&
> + # rebase (--am) should not drop commits that start empty
> + git rebase upstream &&
> +
> + test_write_lines D C B A >expect &&
> + git log --format=%s >actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_failure 'rebase --merge with a variety of empty commits' '
> + test_when_finished "git rebase --abort" &&
> + git checkout -B testing localmods &&
> + # rebase --merge should not halt on the commit that becomes empty
> + git rebase --merge upstream &&
> +
> + test_write_lines D C B A >expect &&
> + git log --format=%s >actual &&
> + test_cmp expect actual
> +'
> +
> +GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
This doesn't do any harm but I'm not sure it's needed
Best Wishes
Phillip
> +test_expect_success 'rebase --interactive with a variety of empty commits' '
> + git checkout -B testing localmods &&
> + test_must_fail git rebase --interactive upstream &&
> +
> + git rebase --skip &&
> +
> + test_write_lines D C B A >expect &&
> + git log --format=%s >actual &&
> + test_cmp expect actual
> +'
> +
> +test_done
> diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
> index bec48e6a1f..8dceef61cf 100755
> --- a/t/t3427-rebase-subtree.sh
> +++ b/t/t3427-rebase-subtree.sh
> @@ -85,23 +85,23 @@ test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --
> verbose test "$(commit_message HEAD)" = "Empty commit"
> '
>
> -test_expect_success 'Rebase -Xsubtree --keep-empty --onto commit' '
> +test_expect_success 'Rebase -Xsubtree --onto commit' '
> reset_rebase &&
> git checkout -b rebase-onto to-rebase &&
> - test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --onto files-master master &&
> + test_must_fail git rebase -Xsubtree=files_subtree --onto files-master master &&
> : first pick results in no changes &&
> - git rebase --continue &&
> + git rebase --skip &&
> verbose test "$(commit_message HEAD~2)" = "master4" &&
> verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
> verbose test "$(commit_message HEAD)" = "Empty commit"
> '
>
> -test_expect_success 'Rebase -Xsubtree --keep-empty --rebase-merges --onto commit' '
> +test_expect_success 'Rebase -Xsubtree --rebase-merges --onto commit' '
> reset_rebase &&
> git checkout -b rebase-merges-onto to-rebase &&
> - test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --rebase-merges --onto files-master --root &&
> + test_must_fail git rebase -Xsubtree=files_subtree --rebase-merges --onto files-master --root &&
> : first pick results in no changes &&
> - git rebase --continue &&
> + git rebase --skip &&
> verbose test "$(commit_message HEAD~2)" = "master4" &&
> verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
> verbose test "$(commit_message HEAD)" = "Empty commit"
>
next prev parent reply other threads:[~2020-02-09 15:59 UTC|newest]
Thread overview: 161+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-20 17:09 [PATCH 00/15] rebase: make the default backend configurable Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 01/15] rebase: extend the options for handling of empty commits Elijah Newren via GitGitGadget
2019-12-20 21:29 ` Junio C Hamano
2019-12-21 0:32 ` Elijah Newren
2019-12-21 18:52 ` Elijah Newren
2019-12-21 23:49 ` Junio C Hamano
2019-12-20 17:09 ` [PATCH 02/15] t3406: simplify an already simple test Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 03/15] rebase, sequencer: remove the broken GIT_QUIET handling Elijah Newren via GitGitGadget
2019-12-20 21:34 ` Junio C Hamano
2019-12-20 17:09 ` [PATCH 04/15] rebase: make sure to pass along the quiet flag to the sequencer Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 05/15] rebase: fix handling of restrict_revision Elijah Newren via GitGitGadget
2019-12-20 21:37 ` Junio C Hamano
2019-12-20 17:09 ` [PATCH 06/15] t3432: make these tests work with either am or merge backends Elijah Newren via GitGitGadget
2019-12-22 5:11 ` Denton Liu
2019-12-23 17:17 ` Elijah Newren
2019-12-20 17:09 ` [PATCH 07/15] rebase: allow more types of rebases to fast-forward Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 08/15] git-rebase.txt: add more details about behavioral differences of backends Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 09/15] rebase: move incompatibility checks between backend options a bit earlier Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 10/15] rebase: add an --am option Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 11/15] contrib: change the prompt for am-based rebases Elijah Newren via GitGitGadget
2019-12-20 23:07 ` SZEDER Gábor
2019-12-21 0:17 ` Elijah Newren
2019-12-20 17:09 ` [PATCH 12/15] rebase tests: mark tests specific to the am-backend with --am Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 13/15] rebase tests: repeat some tests using the merge backend instead of am Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 14/15] rebase: make the backend configurable via config setting Elijah Newren via GitGitGadget
2019-12-20 17:09 ` [PATCH 15/15] rebase: change the default backend from "am" to "merge" Elijah Newren via GitGitGadget
2019-12-20 18:51 ` [PATCH 00/15] rebase: make the default backend configurable Alban Gruin
2019-12-20 18:55 ` Elijah Newren
2019-12-23 18:49 ` [PATCH v2 " Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 01/15] rebase: extend the options for handling of empty commits Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 02/15] t3406: simplify an already simple test Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 03/15] rebase, sequencer: remove the broken GIT_QUIET handling Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 04/15] rebase: make sure to pass along the quiet flag to the sequencer Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 05/15] rebase: fix handling of restrict_revision Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 06/15] t3432: make these tests work with either am or merge backends Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 07/15] rebase: allow more types of rebases to fast-forward Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 08/15] git-rebase.txt: add more details about behavioral differences of backends Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 09/15] rebase: move incompatibility checks between backend options a bit earlier Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 10/15] rebase: add an --am option Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 11/15] contrib: change the prompt for interactive-based rebases Elijah Newren via GitGitGadget
2019-12-23 22:00 ` Denton Liu
2019-12-23 18:49 ` [PATCH v2 12/15] rebase tests: mark tests specific to the am-backend with --am Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 13/15] rebase tests: repeat some tests using the merge backend instead of am Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 14/15] rebase: make the backend configurable via config setting Elijah Newren via GitGitGadget
2019-12-23 18:49 ` [PATCH v2 15/15] rebase: change the default backend from "am" to "merge" Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 00/15] rebase: make the default backend configurable Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 01/15] rebase: extend the options for handling of empty commits Elijah Newren via GitGitGadget
2020-01-07 14:37 ` Phillip Wood
2020-01-07 19:15 ` Elijah Newren
2020-01-08 14:27 ` Phillip Wood
2020-01-09 21:32 ` Johannes Schindelin
2019-12-24 19:54 ` [PATCH v3 02/15] t3406: simplify an already simple test Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 03/15] rebase, sequencer: remove the broken GIT_QUIET handling Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 04/15] rebase: make sure to pass along the quiet flag to the sequencer Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 05/15] rebase: fix handling of restrict_revision Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 06/15] t3432: make these tests work with either am or merge backends Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 07/15] rebase: allow more types of rebases to fast-forward Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 08/15] git-rebase.txt: add more details about behavioral differences of backends Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 09/15] rebase: move incompatibility checks between backend options a bit earlier Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 10/15] rebase: add an --am option Elijah Newren via GitGitGadget
2020-01-07 14:43 ` Phillip Wood
2020-01-07 19:26 ` Elijah Newren
2020-01-07 20:11 ` Junio C Hamano
2020-01-08 14:32 ` Phillip Wood
2020-01-08 17:18 ` Junio C Hamano
2020-01-08 18:55 ` Phillip Wood
2019-12-24 19:54 ` [PATCH v3 11/15] git-prompt: change the prompt for interactive-based rebases Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 12/15] rebase tests: mark tests specific to the am-backend with --am Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 13/15] rebase tests: repeat some tests using the merge backend instead of am Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 14/15] rebase: make the backend configurable via config setting Elijah Newren via GitGitGadget
2019-12-24 19:54 ` [PATCH v3 15/15] rebase: change the default backend from "am" to "merge" Elijah Newren via GitGitGadget
2020-01-10 23:14 ` Jonathan Nieder
2020-01-11 1:16 ` Elijah Newren
2020-01-11 14:41 ` Phillip Wood
2020-01-12 17:59 ` Johannes Schindelin
2020-01-16 6:32 ` Elijah Newren
2020-01-16 7:58 ` Jonathan Nieder
2020-01-16 8:06 ` Jonathan Nieder
2020-01-16 16:18 ` Elijah Newren
2020-01-16 20:35 ` Jonathan Nieder
2020-01-16 21:30 ` Elijah Newren
2020-01-16 22:39 ` Jonathan Nieder
2020-01-16 23:19 ` Elijah Newren
2020-01-16 23:25 ` Junio C Hamano
2020-01-17 0:51 ` Elijah Newren
2020-01-16 15:35 ` Elijah Newren
2020-01-16 20:05 ` Junio C Hamano
2020-01-16 10:48 ` Johannes Schindelin
2020-01-12 21:23 ` Junio C Hamano
2020-01-15 19:50 ` Jonathan Nieder
2020-01-15 21:59 ` Emily Shaffer
2020-01-16 6:14 ` [PATCH v4 00/19] rebase: make the default backend configurable Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 01/19] git-rebase.txt: update description of --allow-empty-message Elijah Newren via GitGitGadget
2020-02-09 15:59 ` Phillip Wood
2020-02-13 18:35 ` Elijah Newren
2020-01-16 6:14 ` [PATCH v4 02/19] t3404: directly test the behavior of interest Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 03/19] rebase (interactive-backend): make --keep-empty the default Elijah Newren via GitGitGadget
2020-02-09 15:59 ` Phillip Wood [this message]
2020-02-13 18:52 ` Elijah Newren
2020-01-16 6:14 ` [PATCH v4 04/19] rebase (interactive-backend): fix handling of commits that become empty Elijah Newren via GitGitGadget
2020-02-10 14:27 ` Phillip Wood
2020-02-13 18:54 ` Elijah Newren
2020-02-16 14:46 ` Phillip Wood
2020-01-16 6:14 ` [PATCH v4 05/19] t3406: simplify an already simple test Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 06/19] rebase, sequencer: remove the broken GIT_QUIET handling Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 07/19] rebase: make sure to pass along the quiet flag to the sequencer Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 08/19] rebase: fix handling of restrict_revision Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 09/19] t3432: make these tests work with either am or merge backends Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 10/19] rebase: allow more types of rebases to fast-forward Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 11/19] git-rebase.txt: add more details about behavioral differences of backends Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 12/19] rebase: move incompatibility checks between backend options a bit earlier Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 13/19] rebase: add an --am option Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 14/19] git-prompt: change the prompt for interactive-based rebases Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 15/19] rebase: drop '-i' from the reflog " Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 16/19] rebase tests: mark tests specific to the am-backend with --am Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 17/19] rebase tests: repeat some tests using the merge backend instead of am Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 18/19] rebase: make the backend configurable via config setting Elijah Newren via GitGitGadget
2020-01-16 6:14 ` [PATCH v4 19/19] rebase: change the default backend from "am" to "merge" Elijah Newren via GitGitGadget
2020-01-17 16:58 ` [PATCH v4 00/19] rebase: make the default backend configurable Phillip Wood
2020-02-05 21:06 ` Junio C Hamano
2020-02-05 22:38 ` Elijah Newren
2020-02-15 21:36 ` [PATCH v5 00/20] rebase: make the default backend configurable and change the default Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 01/20] git-rebase.txt: update description of --allow-empty-message Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 02/20] t3404: directly test the behavior of interest Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 03/20] rebase (interactive-backend): make --keep-empty the default Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 04/20] rebase (interactive-backend): fix handling of commits that become empty Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 05/20] t3406: simplify an already simple test Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 06/20] rebase, sequencer: remove the broken GIT_QUIET handling Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 07/20] rebase: make sure to pass along the quiet flag to the sequencer Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 08/20] rebase: fix handling of restrict_revision Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 09/20] t3432: make these tests work with either am or merge backends Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 10/20] rebase: allow more types of rebases to fast-forward Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 11/20] git-rebase.txt: add more details about behavioral differences of backends Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 12/20] rebase: move incompatibility checks between backend options a bit earlier Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 13/20] rebase: add an --am option Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 14/20] git-prompt: change the prompt for interactive-based rebases Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 15/20] rebase: drop '-i' from the reflog " Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 16/20] rebase tests: mark tests specific to the am-backend with --am Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 17/20] rebase tests: repeat some tests using the merge backend instead of am Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 18/20] rebase: make the backend configurable via config setting Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 19/20] rebase: change the default backend from "am" to "merge" Elijah Newren via GitGitGadget
2020-02-15 21:36 ` [PATCH v5 20/20] rebase: rename the two primary rebase backends Elijah Newren via GitGitGadget
2020-03-12 15:13 ` Emily Shaffer
2020-03-12 16:33 ` Elijah Newren
2020-03-12 17:55 ` Jonathan Nieder
2020-03-12 18:39 ` Elijah Newren
2020-03-12 18:46 ` Jonathan Nieder
2020-03-12 19:31 ` Elijah Newren
2020-03-17 2:58 ` Jonathan Nieder
2020-03-17 4:45 ` Elijah Newren
2020-03-12 19:54 ` Junio C Hamano
2020-03-12 19:07 ` Junio C Hamano
2020-03-12 19:12 ` Jonathan Nieder
2020-03-12 19:12 ` Junio C Hamano
2020-03-12 19:29 ` Elijah Newren
2020-03-12 20:37 ` Jeff King
2020-03-12 21:27 ` Junio C Hamano
2020-03-12 22:06 ` Elijah Newren
2020-03-13 0:04 ` Junio C Hamano
2020-03-12 23:30 ` Jonathan Nieder
2020-02-16 15:01 ` [PATCH v5 00/20] rebase: make the default backend configurable and change the default Phillip Wood
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=805e3edd-d479-16b8-c67f-d8ea34176389@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=alban.gruin@gmail.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=liu.denton@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=plroskin@gmail.com \
--cc=szeder.dev@gmail.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.
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 NNTP newsgroup(s).