From: Alban Gruin <alban.gruin@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [RFC PATCH 1/9] t3404: demonstrate that --edit-todo does not check for dropped commits
Date: Fri, 19 Jul 2019 20:12:27 +0200 [thread overview]
Message-ID: <2836634.HGSAIcGHtf@andromeda> (raw)
In-Reply-To: <xmqqwogfxkhx.fsf@gitster-ct.c.googlers.com>
Hi Junio,
Le 18/07/2019 à 20:31, Junio C Hamano a écrit :
> Alban Gruin <alban.gruin@gmail.com> writes:
> > When set to "warn" or "error", `rebase.missingCommitCheck' would make
> > rebase -i warn if the user removed commits from the todo list to prevent
> > mistakes. Unfortunately, rebase --edit-todo and rebase --continue don't
> > take it into account.
> >
> > This adds three tests to t3404 to demonstrate this. The first one is
> > not broken, as when `rebase.missingCommitsCheck' is not set, nothing in
> > particular must be done towards dropped commits. The two others are
> > broken, demonstrating the problem.
> >
> > Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
> > ---
> >
> > t/t3404-rebase-interactive.sh | 82 +++++++++++++++++++++++++++++++++++
> > 1 file changed, 82 insertions(+)
> >
> > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> > index 461dd539ff..f5c0a8d2bb 100755
> > --- a/t/t3404-rebase-interactive.sh
> > +++ b/t/t3404-rebase-interactive.sh
> > @@ -1345,6 +1345,88 @@ 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 &&
> > + test_must_fail env FAKE_LINES="1 2 bad 3 4" \
> > + git rebase -i --root >/dev/null 2>stderr &&
>
> Do you need to capture into stderr? Nobody seems to use it.
>
No. I’m changing this.
> > + FAKE_LINES="1 2 4" 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
> > +'
> > +
> > +cat >expect <<EOF
> > +error: invalid line 5: badcmd $(git rev-list --pretty=oneline
> > --abbrev-commit -1 master) +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.
> > +
> > +EOF
> > +
> > +tail -n 8 <expect >expect.2
>
> Having this outside the test_expect_success block that uses the file
> is bad. You may have mimicked other tests in the same script, but
> that is not a good excuse to make things worse. Just make sure
> these new stuff follow the best-current-practice pattern without
> touching the existing bad examples (and later fix them up after the
> dust settles, but don't let it distract you from the theme these
> patches are addressing).
>
Okay.
> > +
> > +test_expect_failure 'rebase --edit-todo respects
> > rebase.missingCommitsCheck = warn' ' + test_config
> > rebase.missingCommitsCheck warn &&
> > + rebase_setup_and_clean missing-commit &&
> > + set_fake_editor &&
> > + test_must_fail env FAKE_LINES="1 2 3 4 bad 5" \
> > + git rebase -i --root >/dev/null 2>stderr &&
>
> Ditto.
>
> > + FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual &&
> > + test_i18ncmp expect actual &&
>
> So, after "--edit-todo", you are supposed to get an error and a warning,
> but ...
>
> > + git rebase --continue 2>actual.2 &&
> > + head -n 8 <actual.2 >actual &&
> > + test_i18ncmp expect.2 actual &&
>
> ... after "--continue", you do not get any error, as you removed
> 'bad' from the input, but you still get a warning, followed by a
> report of the fact that a commit has been dropped. OK.
>
> > + test D = $(git cat-file commit HEAD | sed -ne \$p) &&
> > + test_i18ngrep \
> > + "Successfully rebased and updated refs/heads/missing-
commit" \
> > + actual.2
> > +'
> > +
> > +cat >expect <<EOF
> > +error: invalid line 3: badcmd $(git rev-list --pretty=oneline
> > --abbrev-commit -1 master~2) +Warning: some commits may have been dropped
> > accidentally.
> > +Dropped commits (newer to older):
> > + - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
> > + - $(git rev-list --pretty=oneline --abbrev-commit -1 master~2)
> > +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.
> > +
> > +EOF
> > +
> > +tail -n 9 <expect >expect.2
> > +
> > +test_expect_failure 'rebase --edit-todo respects
> > rebase.missingCommitsCheck = error' ' + test_config
> > rebase.missingCommitsCheck error &&
> > + rebase_setup_and_clean missing-commit &&
> > + set_fake_editor &&
> > + test_must_fail env FAKE_LINES="1 2 bad 3 4" \
> > + git rebase -i --root >/dev/null 2>stderr &&
> > + test_must_fail env FAKE_LINES="1 2 4" \
> > + git rebase --edit-todo 2>actual &&
> > + test_i18ncmp expect actual &&
> > + test_must_fail git rebase --continue 2>actual &&
>
> OK, and this one fails as the configuration is set to 'error'.
>
> > + test_i18ncmp expect.2 actual &&
> > + cp .git/rebase-merge/git-rebase-todo.backup \
> > + .git/rebase-merge/git-rebase-todo &&
>
> Why? Who uses this copy?
>
The same technique is used in "rebase -i respects rebase.missingCommitsCheck =
error".
> > + FAKE_LINES="1 2 drop 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-07-19 18:12 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 [this message]
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
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=2836634.HGSAIcGHtf@andromeda \
--to=alban.gruin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--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).