{"thread":{"id":"54476","subject":"[PATCH] sequencer: remove duplicate rollback_lock_file() call","startedAt":"2020-10-21T13:24:40Z","lastAt":"2020-10-22T09:12:33Z","messageCount":4,"participants":["Elijah Newren via GitGitGadget","Taylor Blau","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"408056","messageId":"pull.894.git.git.1603286675709.gitgitgadget@gmail.com","threadId":"54476","inReplyTo":null,"subject":"[PATCH] sequencer: remove duplicate rollback_lock_file() call","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-10-21T13:24:35Z","receivedAt":"2020-10-21T13:24:40Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\nCommit 2b6ad0f4bc (\"rebase --rebase-merges: add support for octopus\nmerges\", 2017-12-21) introduced a case where rollback_lock_file() was\nunconditionally called twice in a row with no intervening commands.\nRemove the duplicate.\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n    sequencer: remove duplicate rollback_lock_file() call\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-894%2Fnewren%2Fremove-duplicate-sequencer-code-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-894/newren/remove-duplicate-sequencer-code-v1\nPull-Request: https://github.com/git/git/pull/894\n\n sequencer.c | 1 -\n 1 file changed, 1 deletion(-)\n\ndiff --git a/sequencer.c b/sequencer.c\nindex 00acb12496..baff51035e 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -3689,7 +3689,6 @@ static int do_merge(struct repository *r,\n \t\t\t\tNULL, 0);\n \t\trollback_lock_file(&lock);\n \n-\t\trollback_lock_file(&lock);\n \t\tret = run_command(&cmd);\n \n \t\t/* force re-reading of the cache */\n\nbase-commit: 69986e19ffcfb9af674ae5180689ab7bbf92ed28\n-- \ngitgitgadget\n"},{"id":"408070","messageId":"20201021171727.GA1237181@nand.local","threadId":"54476","inReplyTo":"pull.894.git.git.1603286675709.gitgitgadget@gmail.com","subject":"Re: [PATCH] sequencer: remove duplicate rollback_lock_file() call","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2020-10-21T17:17:27Z","receivedAt":"2020-10-21T17:17:32Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"Hi Elijah,\n\nOn Wed, Oct 21, 2020 at 01:24:35PM +0000, Elijah Newren via GitGitGadget wrote:\n> diff --git a/sequencer.c b/sequencer.c\n> index 00acb12496..baff51035e 100644\n> --- a/sequencer.c\n> +++ b/sequencer.c\n> @@ -3689,7 +3689,6 @@ static int do_merge(struct repository *r,\n>  \t\t\t\tNULL, 0);\n>  \t\trollback_lock_file(&lock);\n>\n> -\t\trollback_lock_file(&lock);\n\nLooks obviously good to me, thanks.\n\n  Reviewed-by: Taylor Blau <me@ttaylorr.com>\n\nThanks,\nTaylor\n"},{"id":"408090","messageId":"xmqqmu0f73s6.fsf@gitster.c.googlers.com","threadId":"54476","inReplyTo":"20201021171727.GA1237181@nand.local","subject":"Re: [PATCH] sequencer: remove duplicate rollback_lock_file() call","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-10-21T19:55:05Z","receivedAt":"2020-10-21T19:55:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Taylor Blau <me@ttaylorr.com> writes:\n\n> Hi Elijah,\n>\n> On Wed, Oct 21, 2020 at 01:24:35PM +0000, Elijah Newren via GitGitGadget wrote:\n>> diff --git a/sequencer.c b/sequencer.c\n>> index 00acb12496..baff51035e 100644\n>> --- a/sequencer.c\n>> +++ b/sequencer.c\n>> @@ -3689,7 +3689,6 @@ static int do_merge(struct repository *r,\n>>  \t\t\t\tNULL, 0);\n>>  \t\trollback_lock_file(&lock);\n>>\n>> -\t\trollback_lock_file(&lock);\n>\n> Looks obviously good to me, thanks.\n>\n>   Reviewed-by: Taylor Blau <me@ttaylorr.com>\n>\n> Thanks,\n> Taylor\n\nThanks, both.  That's an embarrassing one.\n"},{"id":"408156","messageId":"nycvar.QRO.7.76.6.2010221111320.56@tvgsbejvaqbjf.bet","threadId":"54476","inReplyTo":"pull.894.git.git.1603286675709.gitgitgadget@gmail.com","subject":"Re: [PATCH] sequencer: remove duplicate rollback_lock_file() call","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-10-22T09:12:29Z","receivedAt":"2020-10-22T09:12:33Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Elijah,\n\nOn Wed, 21 Oct 2020, Elijah Newren via GitGitGadget wrote:\n\n> From: Elijah Newren <newren@gmail.com>\n>\n> Commit 2b6ad0f4bc (\"rebase --rebase-merges: add support for octopus\n> merges\", 2017-12-21) introduced a case where rollback_lock_file() was\n> unconditionally called twice in a row with no intervening commands.\n> Remove the duplicate.\n\nThank you for cleaning up after me. I _know_ that this slipped in a couple\ntimes during my rebasing, and still, this last time it slipped through.\n\nACK,\nDscho\n"}]}