-
Bug
-
Resolution: Done
-
P3: Somewhat important
-
Qt Creator 2.5.0-beta
-
93e51c186a705ae7d06ebcc2e56bbda36bca9ae0
- Prepare a project which is checked into git on a tracking branch.
- Open Creator.
- Make sure that "Pull with rebase" is checked in "Tools" -> "Options" -> "Version Control" -> "Git".
- Open the project from step 1.
- Open a file of the project.
- Make some changes and save them. Do not commit.
- Select "Tools" -> "Git" -> "Pull" from the menu.
Creator will ask "Would you like to stash your changes?" - Click "No".
Pull operation will fail with the following output in "Version Control" tab:19:15 Executing in /home/rob/dev/creator: /usr/bin/git status -s -b 19:15 Executing in /home/rob/dev/creator: /usr/bin/git pull --rebase Cannot pull with rebase: You have unstaged changes. Please commit or stash them. The command '/usr/bin/git' terminated with exit code 1. The command 'git pull --rebase' failed, aborting rebase. 19:15 Executing in /home/rob/dev/creator: /usr/bin/git rebase --abort No rebase in progress?
Instead, after clicking "No", Creator should abandon the uncommitted changes and then pull, like the following commands do:
git checkout . git pull --rebase