* [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16
@ 2018-01-24 12:19 Dimitriy
2018-01-24 18:54 ` Igor Djordjevic
0 siblings, 1 reply; 3+ messages in thread
From: Dimitriy @ 2018-01-24 12:19 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16
2018-01-24 12:19 [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16 Dimitriy
@ 2018-01-24 18:54 ` Igor Djordjevic
2018-01-25 11:04 ` Dimitriy
0 siblings, 1 reply; 3+ messages in thread
From: Igor Djordjevic @ 2018-01-24 18:54 UTC (permalink / raw)
To: Dimitriy, git
Hi Dimitriy,
On 24/01/2018 13:19, Dimitriy wrote:
>
> Looks like regression in 2.16.
> Worked fine before update.
> Seems like git stash is not always working.
> Any ideas?
Could this be the same one as reported as Git for Windows issue
#1437[1] ("`git status` reports (non-existent) modifications after
`git stash push`", 2018-01-20), fixed in Git for Windows v2.16.1...?
Care to try it out? :)
Regards, Buga
[1] https://github.com/git-for-windows/git/issues/1437
> $ 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-25 11:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-24 12:19 [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16 Dimitriy
2018-01-24 18:54 ` Igor Djordjevic
2018-01-25 11:04 ` Dimitriy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.