From: Phillip Wood <phillip.wood123@gmail.com>
To: Alban Gruin <alban.gruin@gmail.com>, git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v3 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
Date: Mon, 9 Dec 2019 16:08:24 +0000 [thread overview]
Message-ID: <b399fe9c-0b76-c7ac-7f88-48b31a7e2ce3@gmail.com> (raw)
In-Reply-To: <20191202234759.26201-3-alban.gruin@gmail.com>
Hi Alban
On 02/12/2019 23:47, Alban Gruin wrote:
> [...]
> diff --git a/sequencer.c b/sequencer.c
> index 181bb35f5f..75d5ad0496 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -4271,8 +4271,20 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
> if (read_populate_opts(opts))
> return -1;
> if (is_rebase_i(opts)) {
> + struct todo_list backup = TODO_LIST_INIT;
> +
> if ((res = read_populate_todo(r, &todo_list, opts)))
> goto release_todo_list;
> +
> + if (strbuf_read_file(&backup.buf, rebase_path_todo_backup(), 0) > 0) {
> + todo_list_parse_insn_buffer(r, backup.buf.buf, &backup);
> + res = todo_list_check(&backup, &todo_list);
> + todo_list_release(&backup);
This causes problems if the user edits the todo list and then later runs
'git rebase --continue' after resolving conflicts as the backup todo
list has a bunch of commands that have already been processed but they
are seen as missing
This test fails
test_expect_success 'rebase.missingCommitsCheck = error after resolving
conflicts' '
test_config rebase.missingCommitsCheck error &&
(
set_fake_editor &&
FAKE_LINES="break 2 3 4" git rebase -i A E
) &&
git rebase --edit-todo &&
test_must_fail git rebase --continue &&
echo x >file1 &&
git add file1 &&
git rebase --continue
'
I think it would be better to write a file if the check fails when
editing the todo list and check for the presence of that file when
continuing and error out if it exists. This would also allow --edit-todo
to only remove the backup file if there are no outstanding errors from
the last edit and so check that those errors are fixed by the second
edit. I think we'd only want to do this if rebase.missingCommitsCheck is
set to error.
Best Wishes
Phillip
> +
> + if (res)
> + goto release_todo_list;
> + }
> +
> if (commit_staged_changes(r, opts, &todo_list))
> return -1;
> } else if (!file_exists(get_todo_path(opts)))
> @@ -4986,12 +4998,6 @@ int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
> return res;
> }
>
> -static const char edit_todo_list_advice[] =
> -N_("You can fix this with 'git rebase --edit-todo' "
> -"and then run 'git rebase --continue'.\n"
> -"Or you can abort the rebase with 'git rebase"
> -" --abort'.\n");
> -
> /* skip picking commits whose parents are unchanged */
> static int skip_unnecessary_picks(struct repository *r,
> struct todo_list *todo_list,
> @@ -5089,11 +5095,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
> todo_list_release(&new_todo);
>
> return error(_("nothing to do"));
> - }
> -
> - if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) ||
> - todo_list_check(todo_list, &new_todo)) {
> - fprintf(stderr, _(edit_todo_list_advice));
> + } else if (res == -4) {
> checkout_onto(r, opts, onto_name, &onto->object.oid, orig_head);
> todo_list_release(&new_todo);
>
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 29a35840ed..9051c1e11d 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -1343,6 +1343,89 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
> test B = $(git cat-file commit HEAD^ | sed -ne \$p)
> '
>
> +test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = ignore' '
> + test_config rebase.missingCommitsCheck ignore &&
> + rebase_setup_and_clean missing-commit &&
> + set_fake_editor &&
> + FAKE_LINES="break 1 2 3 4 5" git rebase -i --root &&
> + FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual &&
> + git rebase --continue 2>actual &&
> + test D = $(git cat-file commit HEAD | sed -ne \$p) &&
> + test_i18ngrep \
> + "Successfully rebased and updated refs/heads/missing-commit" \
> + actual
> +'
> +
> +test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = warn' '
> + cat >expect <<-EOF &&
> + error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 master~4)
> + Warning: some commits may have been dropped accidentally.
> + Dropped commits (newer to older):
> + - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
> + To avoid this message, use "drop" to explicitly remove a commit.
> + EOF
> + tail -n4 expect >expect.2 &&
> + test_config rebase.missingCommitsCheck warn &&
> + rebase_setup_and_clean missing-commit &&
> + set_fake_editor &&
> + test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
> + git rebase -i --root &&
> + cp .git/rebase-merge/git-rebase-todo.backup orig &&
> + FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
> + head -n5 actual.2 >actual &&
> + test_i18ncmp expect actual &&
> + cp orig .git/rebase-merge/git-rebase-todo &&
> + FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
> + head -n4 actual.2 >actual &&
> + test_i18ncmp expect.2 actual &&
> + git rebase --continue 2>actual &&
> + test D = $(git cat-file commit HEAD | sed -ne \$p) &&
> + test_i18ngrep \
> + "Successfully rebased and updated refs/heads/missing-commit" \
> + actual
> +'
> +
> +test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = error' '
> + cat >expect <<-EOF &&
> + error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 master~4)
> + Warning: some commits may have been dropped accidentally.
> + Dropped commits (newer to older):
> + - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
> + To avoid this message, use "drop" to explicitly remove a commit.
> +
> + Use '\''git config rebase.missingCommitsCheck'\'' to change the level of warnings.
> + The possible behaviours are: ignore, warn, error.
> +
> + You can fix this with '\''git rebase --edit-todo'\'' and then run '\''git rebase --continue'\''.
> + Or you can abort the rebase with '\''git rebase --abort'\''.
> + EOF
> + tail -n10 expect >expect.2 &&
> + test_config rebase.missingCommitsCheck error &&
> + rebase_setup_and_clean missing-commit &&
> + set_fake_editor &&
> + test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
> + git rebase -i --root &&
> + cp .git/rebase-merge/git-rebase-todo.backup orig &&
> + test_must_fail env FAKE_LINES="2 3 4" \
> + git rebase --edit-todo 2>actual &&
> + test_i18ncmp expect actual &&
> + test_must_fail git rebase --continue 2>actual &&
> + test_i18ncmp expect actual &&
> + cp orig .git/rebase-merge/git-rebase-todo &&
> + test_must_fail env FAKE_LINES="1 2 3 4" \
> + git rebase --edit-todo 2>actual &&
> + test_i18ncmp expect.2 actual &&
> + test_must_fail git rebase --continue 2>actual &&
> + test_i18ncmp expect.2 actual &&
> + cp orig .git/rebase-merge/git-rebase-todo &&
> + FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
> + git rebase --continue 2>actual &&
> + test D = $(git cat-file commit HEAD | sed -ne \$p) &&
> + test_i18ngrep \
> + "Successfully rebased and updated refs/heads/missing-commit" \
> + actual
> +'
> +
> test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and exec' '
> rebase_setup_and_clean abbrevcmd &&
> test_commit "first" file1.txt "first line" first &&
>
next prev parent reply other threads:[~2019-12-09 16:08 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 14:39 [RFC PATCH 0/9] rebase -i: extend rebase.missingCommitsCheck to `--edit-todo' and co Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 1/9] t3404: demonstrate that --edit-todo does not check for dropped commits Alban Gruin
2019-07-18 18:31 ` Junio C Hamano
2019-07-19 18:12 ` Alban Gruin
2019-07-19 19:51 ` Junio C Hamano
2019-07-17 14:39 ` [RFC PATCH 2/9] t3429: demonstrate that rebase exec " Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 3/9] sequencer: update `total_nr' when adding an item to a todo list Alban Gruin
2019-07-18 19:52 ` Junio C Hamano
2019-07-19 18:12 ` Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 4/9] sequencer: update `done_nr' when skipping commands in " Alban Gruin
2019-07-18 19:55 ` Junio C Hamano
2019-07-19 18:13 ` Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 5/9] sequencer: move the code writing total_nr on the disk to a new function Alban Gruin
2019-07-18 20:04 ` Junio C Hamano
2019-07-19 18:14 ` Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 6/9] sequencer: add a parameter to sequencer_continue() to accept a todo list Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 7/9] rebase-interactive: todo_list_check() also uses the done list Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 8/9] rebase-interactive: warn if commit is dropped with --edit-todo Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 9/9] sequencer: have read_populate_todo() check for dropped commits Alban Gruin
2019-07-24 13:29 ` [RFC PATCH 0/9] rebase -i: extend rebase.missingCommitsCheck to `--edit-todo' and co Phillip Wood
2019-07-25 9:01 ` Johannes Schindelin
2019-07-25 20:26 ` Alban Gruin
2019-07-29 9:38 ` Phillip Wood
2019-09-24 20:15 ` Alban Gruin
2019-11-04 9:54 ` [RFC PATCH v2 0/2] rebase -i: extend rebase.missingCommitsCheck to `--edit-todo' Alban Gruin
2019-11-04 9:54 ` [RFC PATCH v2 1/2] t3404: demonstrate that --edit-todo does not check for dropped commits Alban Gruin
2019-11-04 9:54 ` [RFC PATCH v2 2/2] rebase-interactive: warn if commit is dropped with --edit-todo Alban Gruin
2019-11-05 14:20 ` Phillip Wood
2019-12-02 23:47 ` [PATCH v3 0/2] rebase -i: extend rebase.missingCommitsCheck Alban Gruin
2019-12-02 23:47 ` [PATCH v3 1/2] sequencer: move check_todo_list_from_file() to rebase-interactive.c Alban Gruin
2019-12-06 14:38 ` Johannes Schindelin
2019-12-02 23:47 ` [PATCH v3 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo' Alban Gruin
2019-12-04 19:19 ` Junio C Hamano
2019-12-09 16:00 ` Phillip Wood
2020-01-09 21:13 ` Alban Gruin
2020-01-10 17:13 ` Phillip Wood
2020-01-10 21:31 ` Alban Gruin
2020-01-11 14:44 ` Phillip Wood
2019-12-09 16:08 ` Phillip Wood [this message]
2019-12-04 21:51 ` [PATCH v3 0/2] rebase -i: extend rebase.missingCommitsCheck Junio C Hamano
2019-12-05 23:15 ` Alban Gruin
2019-12-06 10:41 ` Phillip Wood
2019-12-06 14:30 ` Johannes Schindelin
2020-01-11 17:39 ` [PATCH v4 " Alban Gruin
2020-01-11 17:39 ` [PATCH v4 1/2] sequencer: move check_todo_list_from_file() to rebase-interactive.c Alban Gruin
2020-01-11 17:39 ` [PATCH v4 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo' Alban Gruin
2020-01-19 16:28 ` Phillip Wood
2020-01-25 15:17 ` Alban Gruin
2020-01-25 17:54 ` [PATCH v5 0/2] rebase -i: extend rebase.missingCommitsCheck Alban Gruin
2020-01-25 17:54 ` [PATCH v5 1/2] sequencer: move check_todo_list_from_file() to rebase-interactive.c Alban Gruin
2020-01-25 17:54 ` [PATCH v5 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo' Alban Gruin
2020-01-26 10:04 ` [PATCH v5 0/2] rebase -i: extend rebase.missingCommitsCheck Johannes Schindelin
2020-01-27 21:39 ` Alban Gruin
2020-01-28 22:46 ` Johannes Schindelin
2020-01-28 21:12 ` [PATCH v6 " Alban Gruin
2020-01-28 21:12 ` [PATCH v6 1/2] sequencer: move check_todo_list_from_file() to rebase-interactive.c Alban Gruin
2020-01-28 21:12 ` [PATCH v6 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 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=b399fe9c-0b76-c7ac-7f88-48b31a7e2ce3@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=alban.gruin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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).