{"thread":{"id":"46269","subject":"Bug: Since Git 2.13.2 git rebase autostash doesn't use fast-forward (poor performance)","startedAt":"2017-06-27T14:34:39Z","lastAt":"2017-06-28T08:23:10Z","messageCount":3,"participants":["neuling@dakosy.de","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"323334","messageId":"OF6AC13578.F02B79FA-ONC125814C.004DD247-C125814C.00500A93@dakosy.de","threadId":"46269","inReplyTo":null,"subject":"Bug: Since Git 2.13.2 git rebase autostash doesn't use fast-forward (poor performance)","fromName":"","fromEmail":"neuling@dakosy.de","sentAt":"2017-06-27T14:34:15Z","receivedAt":"2017-06-27T14:34:39Z","isPatch":false,"sender":{"key":"neuling@dakosy.de","avatar":null},"body":"Hi, \n\nsince the latest version 2.13.2 \"git pull --rebase --autostash\" doesn't \nuse a fast forward if possible. \n\nMy global git config contains \"pull.rebase=preserve\" and \n\"rebase.autostash=true\". My working directory is clean with no changes. \n\nWhen I use \"git pull\" git doesn't use a possible fast forward merge. If I \nremove \"rebase.autostash\" from my git config a fast forward merge will \ntake place. \n\nIf a fast forward merge is possible and the working directory is clean \nautostash should do nothing and the fast forward merge should happen. \n\nIs it also possible to implement autostash on fast forward merge that way \nto stash changes, do the fast forward merge and at least to apply the \nstashed changes?\n\nAnother problem is if \"git pull rebase\" without autostash can do a fast \nforward merge the rebase validation for changed files in my working \ndirectory will be done. \n\nI think in that case the fast forward merge validation should run. That \nwould prevent the need to stash local changes if they do not affect files \nof the commits to fast forward from origin branch. \n\n\n\nRegards, \nMattias\n\n"},{"id":"323337","messageId":"xmqqvanh324p.fsf@gitster.mtv.corp.google.com","threadId":"46269","inReplyTo":"OF6AC13578.F02B79FA-ONC125814C.004DD247-C125814C.00500A93@dakosy.de","subject":"Re: Bug: Since Git 2.13.2 git rebase autostash doesn't use fast-forward (poor performance)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-06-27T15:02:14Z","receivedAt":"2017-06-27T15:13:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"neuling@dakosy.de writes:\n\n> since the latest version 2.13.2 \"git pull --rebase --autostash\" doesn't \n> use a fast forward if possible. \n\nThis may not be a bug but instead a fix made deliberately.\n\ncf. http://public-inbox.org/git/CAAZatrCaoB7EXVrCvC9RKmO02G5xcp8GPBaJefHfv7zAXVpL3Q@mail.gmail.com/\n\nA deciding excerpt from the thread was:\n\n> Correctness must trump optimizations\n\nPatches to further update and resurrect the optimization without\nbreaking correctness of course are of course very much welcomed.\n\nThanks.\n"},{"id":"323418","messageId":"OF99731898.CA1C41BB-ONC125814D.002E02EC-C125814D.002E0B32@dakosy.de","threadId":"46269","inReplyTo":"xmqqvanh324p.fsf@gitster.mtv.corp.google.com","subject":"Re: Bug: Since Git 2.13.2 git rebase autostash doesn't use fast-forward (poor performance)","fromName":"","fromEmail":"neuling@dakosy.de","sentAt":"2017-06-28T08:22:55Z","receivedAt":"2017-06-28T08:23:10Z","isPatch":false,"sender":{"key":"neuling@dakosy.de","avatar":null},"body":"Could you see this as suggestion for performance improvement or should I \nsend another e-mail for a new task?\n\nRegards,\nMattias\n\n\nJunio C Hamano <jch2355@gmail.com> schrieb am 27.06.2017 17:02:14:\n\n> Von: Junio C Hamano <gitster@pobox.com>\n> An: neuling@dakosy.de\n> Kopie: git@vger.kernel.org\n> Datum: 27.06.2017 17:02\n> Betreff: Re: Bug: Since Git 2.13.2 git rebase autostash doesn't use \n> fast-forward (poor performance)\n> Gesendet von: Junio C Hamano <jch2355@gmail.com>\n> \n> neuling@dakosy.de writes:\n> \n> > since the latest version 2.13.2 \"git pull --rebase --autostash\" \ndoesn't \n> > use a fast forward if possible. \n> \n> This may not be a bug but instead a fix made deliberately.\n> \n> cf. http://public-inbox.org/git/\n> CAAZatrCaoB7EXVrCvC9RKmO02G5xcp8GPBaJefHfv7zAXVpL3Q@mail.gmail.com/\n> \n> A deciding excerpt from the thread was:\n> \n> > Correctness must trump optimizations\n> \n> Patches to further update and resurrect the optimization without\n> breaking correctness of course are of course very much welcomed.\n> \n> Thanks.\n\n"}]}