{"thread":{"id":"53232","subject":"Re: rebase backend change interaction with rebase.abbreviateCommands and autostash","startedAt":"2020-04-14T20:31:10Z","lastAt":"2020-04-14T20:45:21Z","messageCount":3,"participants":["Elijah Newren","Philippe Blain"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"395442","messageId":"CABPp-BGSQ-FLv-9PS8EJGCivd2pMwYi57mgqKP_7U6HoRuxgAQ@mail.gmail.com","threadId":"53232","inReplyTo":"34B51521-42CD-445B-AE91-4A659A7FE661@me.com","subject":"Re: rebase backend change interaction with rebase.abbreviateCommands and autostash","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2020-04-14T20:30:51Z","receivedAt":"2020-04-14T20:31:10Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Tue, Apr 14, 2020 at 1:27 PM Philippe Blain <philippe.blain@me.com> wrote:\n>\n> Hi,\n>\n> I just had a bizarre error related to the change in the merge backend. I don't have a full reproducer yet but the following sequence should hopefully give some hints.\n>\n> In my config for this repo I have `pull.rebase=true` and in my global config I have\n>\n> [rebase]\n>         abbreviateCommands = true\n>         autoSquash = true\n>\n> Also my local `master` branch tracks `origin/master`.\n>\n> If `master` on `origin` is at the same commit as my local master branch, and I have some uncommitted change so I must use `--autostash`:\n>\n> ```\n> $ git pull --autostash\n> Created autostash: 6a6c685\n> Applied autostash.\n> error: nothing to do\n>\n> $ git pull --autostash --apply\n> # or right that just works for `git rebase`\n> ```\n>\n> Now if `master` on `origin` is ahead of my local `master`:\n>\n> ```\n> $ git pull --autostash\n> remote: Counting objects: 6, done.\n> remote: Compressing objects: 100% (6/6), done.\n> remote: Total 6 (delta 4), reused 0 (delta 0)\n> Unpacking objects: 100% (6/6), 758 bytes | 6.00 KiB/s, done.\n> From <redacted>\n>    42033de..a3d6919  master     -> origin/master\n> Created autostash: cdae23b\n> Applied autostash.\n> error: nothing to do\n>\n> Now if I stash manually and re-pull:\n>\n> $ git stash push -m \"test rebase merge\"\n> Saved working directory and index state On master: test rebase merge\n> $ git pull\n> Updating 42033de..a3d6919\n> Fast-forward\n>  .gitconfig | 1 +\n>  .tmux.conf | 2 +-\n>  2 files changed, 2 insertions(+), 1 deletion(-)\n> error: nothing to do\n> $ git pull\n> Already up to date.\n> error: nothing to do\n> $ git -c rebase.abbreviateCommands=0 pull\n> Already up to date.\n> Successfully rebased and updated refs/heads/master.\n>\n> Note: I also got  \"error: nothing to do\"  when manually running the commands in the last test of t/t5572-pull-submodule.sh (\"branch has no merge base with remote-tracking counterpart') (and again using `git -c rebase.abbreviateCommands=0` succeeded).\n>\n> Cheers,\n> Philippe.\n\nWhat version of git are you running with?  Does it include Alban's\nfixed for the rebase.abbreviateCommands error?\n(https://lore.kernel.org/git/20200330124236.6716-1-alban.gruin@gmail.com/)\n\nElijah\n"},{"id":"395446","messageId":"34B51521-42CD-445B-AE91-4A659A7FE661@me.com","threadId":"53232","inReplyTo":null,"subject":"rebase backend change interaction with rebase.abbreviateCommands and autostash","fromName":"Philippe Blain","fromEmail":"philippe.blain@me.com","sentAt":"2020-04-14T20:27:37Z","receivedAt":"2020-04-14T20:33:31Z","isPatch":false,"sender":{"key":"philippe.blain@me.com","avatar":null},"body":"Hi, \n\nI just had a bizarre error related to the change in the merge backend. I don't have a full reproducer yet but the following sequence should hopefully give some hints.\n\nIn my config for this repo I have `pull.rebase=true` and in my global config I have \n\n[rebase]\n        abbreviateCommands = true\n        autoSquash = true\n\nAlso my local `master` branch tracks `origin/master`. \n\nIf `master` on `origin` is at the same commit as my local master branch, and I have some uncommitted change so I must use `--autostash`:\n\n```\n$ git pull --autostash \nCreated autostash: 6a6c685\nApplied autostash.\nerror: nothing to do\n\n$ git pull --autostash --apply\n# or right that just works for `git rebase`\n```\n\nNow if `master` on `origin` is ahead of my local `master`: \n\n```\n$ git pull --autostash \nremote: Counting objects: 6, done.\nremote: Compressing objects: 100% (6/6), done.\nremote: Total 6 (delta 4), reused 0 (delta 0)\nUnpacking objects: 100% (6/6), 758 bytes | 6.00 KiB/s, done.\nFrom <redacted>\n   42033de..a3d6919  master     -> origin/master\nCreated autostash: cdae23b\nApplied autostash.\nerror: nothing to do\n\nNow if I stash manually and re-pull:\n\n$ git stash push -m \"test rebase merge\"                                                                                                                                                                                     \nSaved working directory and index state On master: test rebase merge\n$ git pull\nUpdating 42033de..a3d6919\nFast-forward\n .gitconfig | 1 +\n .tmux.conf | 2 +-\n 2 files changed, 2 insertions(+), 1 deletion(-)\nerror: nothing to do\n$ git pull\nAlready up to date.\nerror: nothing to do\n$ git -c rebase.abbreviateCommands=0 pull\nAlready up to date.\nSuccessfully rebased and updated refs/heads/master.\n\nNote: I also got  \"error: nothing to do\"  when manually running the commands in the last test of t/t5572-pull-submodule.sh (\"branch has no merge base with remote-tracking counterpart') (and again using `git -c rebase.abbreviateCommands=0` succeeded).\n\nCheers,\nPhilippe.\n\n"},{"id":"395449","messageId":"09D4E5D9-9F7C-447B-9E46-C7B98EF1BD38@gmail.com","threadId":"53232","inReplyTo":"CABPp-BGSQ-FLv-9PS8EJGCivd2pMwYi57mgqKP_7U6HoRuxgAQ@mail.gmail.com","subject":"Re: rebase backend change interaction with rebase.abbreviateCommands and autostash","fromName":"Philippe Blain","fromEmail":"levraiphilippeblain@gmail.com","sentAt":"2020-04-14T20:45:12Z","receivedAt":"2020-04-14T20:45:21Z","isPatch":false,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"\n> Le 14 avr. 2020 à 16:30, Elijah Newren <newren@gmail.com> a écrit :\n> \n> On Tue, Apr 14, 2020 at 1:27 PM Philippe Blain <philippe.blain@me.com> wrote:\n>> \n>> Hi,\n>> \n>> I just had a bizarre error related to the change in the merge backend. I don't have a full reproducer yet but the following sequence should hopefully give some hints.\n>> \n>> In my config for this repo I have `pull.rebase=true` and in my global config I have\n>> \n>> [rebase]\n>>        abbreviateCommands = true\n>>        autoSquash = true\n>> \n>> Also my local `master` branch tracks `origin/master`.\n>> \n>> If `master` on `origin` is at the same commit as my local master branch, and I have some uncommitted change so I must use `--autostash`:\n>> \n>> ```\n>> $ git pull --autostash\n>> Created autostash: 6a6c685\n>> Applied autostash.\n>> error: nothing to do\n>> \n>> $ git pull --autostash --apply\n>> # or right that just works for `git rebase`\n>> ```\n>> \n>> Now if `master` on `origin` is ahead of my local `master`:\n>> \n>> ```\n>> $ git pull --autostash\n>> remote: Counting objects: 6, done.\n>> remote: Compressing objects: 100% (6/6), done.\n>> remote: Total 6 (delta 4), reused 0 (delta 0)\n>> Unpacking objects: 100% (6/6), 758 bytes | 6.00 KiB/s, done.\n>> From <redacted>\n>>   42033de..a3d6919  master     -> origin/master\n>> Created autostash: cdae23b\n>> Applied autostash.\n>> error: nothing to do\n>> \n>> Now if I stash manually and re-pull:\n>> \n>> $ git stash push -m \"test rebase merge\"\n>> Saved working directory and index state On master: test rebase merge\n>> $ git pull\n>> Updating 42033de..a3d6919\n>> Fast-forward\n>> .gitconfig | 1 +\n>> .tmux.conf | 2 +-\n>> 2 files changed, 2 insertions(+), 1 deletion(-)\n>> error: nothing to do\n>> $ git pull\n>> Already up to date.\n>> error: nothing to do\n>> $ git -c rebase.abbreviateCommands=0 pull\n>> Already up to date.\n>> Successfully rebased and updated refs/heads/master.\n>> \n>> Note: I also got  \"error: nothing to do\"  when manually running the commands in the last test of t/t5572-pull-submodule.sh (\"branch has no merge base with remote-tracking counterpart') (and again using `git -c rebase.abbreviateCommands=0` succeeded).\n>> \n>> Cheers,\n>> Philippe.\n> \n> What version of git are you running with?  Does it include Alban's\n> fixed for the rebase.abbreviateCommands error?\n> (https://lore.kernel.org/git/20200330124236.6716-1-alban.gruin@gmail.com/)\n\nI was not aware of this patch series - I'm at v2.26.0-106-g9fadedd637 (on `master`), so no it does not include it.\n\nThanks!\n\n"}]}