git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dimitriy <dimitriy.ryazantcev@gmail.com>
To: git@vger.kernel.org
Subject: [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16
Date: Wed, 24 Jan 2018 14:19:12 +0200	[thread overview]
Message-ID: <CAPUT4mS+p+2n85dB-iWtae+0SDkUoYA5bqtUs+6OaFchjJJeuA@mail.gmail.com> (raw)

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

             reply	other threads:[~2018-01-24 12:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-24 12:19 Dimitriy [this message]
2018-01-24 18:54 ` [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16 Igor Djordjevic
2018-01-25 11:04   ` Dimitriy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAPUT4mS+p+2n85dB-iWtae+0SDkUoYA5bqtUs+6OaFchjJJeuA@mail.gmail.com \
    --to=dimitriy.ryazantcev@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).