{"thread":{"id":"47680","subject":"[BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16","startedAt":"2018-01-24T12:19:17Z","lastAt":"2018-01-25T11:04:17Z","messageCount":3,"participants":["Dimitriy","Igor Djordjevic"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"337253","messageId":"CAPUT4mS+p+2n85dB-iWtae+0SDkUoYA5bqtUs+6OaFchjJJeuA@mail.gmail.com","threadId":"47680","inReplyTo":null,"subject":"[BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16","fromName":"Dimitriy","fromEmail":"dimitriy.ryazantcev@gmail.com","sentAt":"2018-01-24T12:19:12Z","receivedAt":"2018-01-24T12:19:17Z","isPatch":false,"sender":{"key":"dimitriy.ryazantcev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1285934?v=4"},"body":"Looks like regression in 2.16.\nWorked fine before update.\nSeems like git stash is not always working.\nAny ideas?\n\n$ git --version\ngit version 2.16.0.windows.2\n\n$ git config pull.rebase\ntrue\n\n$ git config rebase.autoStash\ntrue\n\n$ git status\nOn branch develop\nYour branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n        modified:   source_work/xxxxx.cpp\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n\n$ git pull\nCreated autostash: 7ddcdf2ba\nHEAD is now at ba14a4c3f some commit\nCannot rebase: You have unstaged changes.\nPlease commit or stash them.\n\n$ git status\nOn branch develop\nYour branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nYou are currently rebasing.\n  (all conflicts fixed: run \"git rebase --continue\")\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n        modified:   source_work/xxxxx.cpp\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n\n$ git rebase --abort\nApplied autostash.\n\n$ git stash\nSaved working directory and index state WIP on develop: ba14a4c3f  some commit\n\n$ git status\nOn branch develop\nYour branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\n        modified:   source_work/xxxxx.cpp\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n\n$ git stash\nSaved working directory and index state WIP on develop: ba14a4c3f  some commit\n\n$ git status\nOn branch develop\nYour branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nnothing to commit, working tree clean\n\n-- \nSincerely,\nDimitriy Ryazantcev\n"},{"id":"337284","messageId":"25ce5341-1200-c54c-eb69-eccfcc088155@gmail.com","threadId":"47680","inReplyTo":"CAPUT4mS+p+2n85dB-iWtae+0SDkUoYA5bqtUs+6OaFchjJJeuA@mail.gmail.com","subject":"Re: [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16","fromName":"Igor Djordjevic","fromEmail":"igor.d.djordjevic@gmail.com","sentAt":"2018-01-24T18:54:15Z","receivedAt":"2018-01-24T18:54:53Z","isPatch":false,"sender":{"key":"igor.d.djordjevic@gmail.com","avatar":null},"body":"Hi Dimitriy,\n\nOn 24/01/2018 13:19, Dimitriy wrote:\n> \n> Looks like regression in 2.16.\n> Worked fine before update.\n> Seems like git stash is not always working.\n> Any ideas?\n\nCould this be the same one as reported as Git for Windows issue \n#1437[1] (\"`git status` reports (non-existent) modifications after \n`git stash push`\", 2018-01-20), fixed in Git for Windows v2.16.1...?\n\nCare to try it out? :)\n\nRegards, Buga\n\n[1] https://github.com/git-for-windows/git/issues/1437\n\n> $ git --version\n> git version 2.16.0.windows.2\n> \n> $ git config pull.rebase\n> true\n> \n> $ git config rebase.autoStash\n> true\n> \n> $ git status\n> On branch develop\n> Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.\n>   (use \"git pull\" to update your local branch)\n> \n> Changes not staged for commit:\n>   (use \"git add <file>...\" to update what will be committed)\n>   (use \"git checkout -- <file>...\" to discard changes in working directory)\n> \n>         modified:   source_work/xxxxx.cpp\n> \n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> \n> $ git pull\n> Created autostash: 7ddcdf2ba\n> HEAD is now at ba14a4c3f some commit\n> Cannot rebase: You have unstaged changes.\n> Please commit or stash them.\n> \n> $ git status\n> On branch develop\n> Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.\n>   (use \"git pull\" to update your local branch)\n> \n> You are currently rebasing.\n>   (all conflicts fixed: run \"git rebase --continue\")\n> \n> Changes not staged for commit:\n>   (use \"git add <file>...\" to update what will be committed)\n>   (use \"git checkout -- <file>...\" to discard changes in working directory)\n> \n>         modified:   source_work/xxxxx.cpp\n> \n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> \n> $ git rebase --abort\n> Applied autostash.\n> \n> $ git stash\n> Saved working directory and index state WIP on develop: ba14a4c3f  some commit\n> \n> $ git status\n> On branch develop\n> Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.\n>   (use \"git pull\" to update your local branch)\n> \n> Changes not staged for commit:\n>   (use \"git add <file>...\" to update what will be committed)\n>   (use \"git checkout -- <file>...\" to discard changes in working directory)\n> \n> \n>         modified:   source_work/xxxxx.cpp\n> \n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> \n> $ git stash\n> Saved working directory and index state WIP on develop: ba14a4c3f  some commit\n> \n> $ git status\n> On branch develop\n> Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.\n>   (use \"git pull\" to update your local branch)\n> \n> nothing to commit, working tree clean\n"},{"id":"337360","messageId":"CAPUT4mTsJUd6uQRWVDwooEr4QeQa2=n1bdeJUUt3KXrT-tRDRg@mail.gmail.com","threadId":"47680","inReplyTo":"25ce5341-1200-c54c-eb69-eccfcc088155@gmail.com","subject":"Re: [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16","fromName":"Dimitriy","fromEmail":"dimitriy.ryazantcev@gmail.com","sentAt":"2018-01-25T11:04:09Z","receivedAt":"2018-01-25T11:04:17Z","isPatch":false,"sender":{"key":"dimitriy.ryazantcev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1285934?v=4"},"body":"Yeah it seems like this bug. Thank you for sharing this with me.\n-- \nSincerely,\nDimitriy Ryazantcev\n\n> Could this be the same one as reported as Git for Windows issue\n> #1437[1] (\"`git status` reports (non-existent) modifications after\n> `git stash push`\", 2018-01-20), fixed in Git for Windows v2.16.1...?\n>\n> Care to try it out? :)\n>\n> Regards, Buga\n>\n> [1] https://github.com/git-for-windows/git/issues/1437\n"}]}