git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16

From
Dimitriy <dimitriy.ryazantcev@gmail.com>
Date
Jan 24, 2018, 12:19 UTC
Message-ID
<CAPUT4mS+p+2n85dB-iWtae+0SDkUoYA5bqtUs+6OaFchjJJeuA@mail.gmail.com>

Looks like regression in 2.16. Worked fine before update. Seems like git stash is not always working. Any ideas?

$ git --version git version 2.16.0.windows.2

$ git config pull.rebase true

$ git config rebase.autoStash true

$ git status
On branch develop
Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   source_work/xxxxx.cpp
no changes added to commit (use "git add" and/or "git commit -a")

$ git pull Created autostash: 7ddcdf2ba HEAD is now at ba14a4c3f some commit Cannot rebase: You have unstaged changes. Please commit or stash them.

$ git status
On branch develop
Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
You are currently rebasing.
  (all conflicts fixed: run "git rebase --continue")
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   source_work/xxxxx.cpp
no changes added to commit (use "git add" and/or "git commit -a")

$ git rebase --abort Applied autostash.

$ git stash Saved working directory and index state WIP on develop: ba14a4c3f some commit

$ git status
On branch develop
Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   source_work/xxxxx.cpp
no changes added to commit (use "git add" and/or "git commit -a")

$ git stash Saved working directory and index state WIP on develop: ba14a4c3f some commit

$ git status
On branch develop
Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
nothing to commit, working tree clean
-- 
Sincerely,
Dimitriy Ryazantcev
Next: Igor Djordjevic
Message 1 of 3 in “[BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16”
  1. DimitriyJan 24, 2018
  2. Igor DjordjevicJan 24, 2018
  3. DimitriyJan 25, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.