Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

git flow start/finish reports unstaged changes when there are none to commit or push #81

Open
devlins opened this Issue · 15 comments

12 participants

Devlin Schoonraad Vincent Driessen Daniel Gräber Vinit Kumar bekas norbertas-gaulia Irfan Ahmed georgezlatev brink-martens Niels Luke Willett Fabian Spreng
Devlin Schoonraad

Sometimes when performing git flow start or finish, git flow will report:

fatal: Working tree contains unstaged changes. Aborting.

There is however nothing to commit and nothing to pull or push to/from the remote. The working copy is up to date.

I have had to work around this issue by creating false commits of changes to a "readme.txt" file in order to perform these steps, but this is tedious. Is there another command that I can use to see what is blocking the git flow start/finish command?

Vincent Driessen
Owner

Please provide a replay of your commands that lead to this issue. That would definitely make it easier to analyse what causes this issue. Try to keep it as short as possible.

Daniel Gräber

This could happen when you delete files and won't commit. Check the staged files with git diff --cached and commit.

Vinit Kumar

There is not output with git diff --cached . Any idea, how to resolve the issue?

bekas

i have a same problem. Do you find any decision?

Vinit Kumar

The easiest solution is to commit the changes ,delete the repo and re clone it.

bekas

thanks a lot

norbertas-gaulia

Most of the time bug is hapening with eGit on Eclipse based ide's, when i use git bash or tortoise git this error does not appear

Irfan Ahmed

git reset --hard origin/master can save your life!

georgezlatev

It is very strange however executing:
git status
and repeating the command works as a fix in my environment.:-)

brink-martens

we are having the same effect like @georgezlatev working on MAC OS X with intellij Idea 13. Seems that git-flow does not register a commit in a timely fashion ;-)

Will this be fixed?

Niels

I only get this error when trying to git flow finish from a subdirectory. It works from the repos root directory.
Cheers guys

Luke Willett

Appreciate this thread is old but i'm sure others will still be getting this error and will find this thread. I am using SourceTree and was getting this error. I managed to fix this by right clicking on my feature branch and then merging into develop/origin. I was than able to push my committed changes and delete the feature branch.

brink-martens

best Option would be if the scripts execute a git status before trying to finish a feature:

if output=$(git status --porcelain) && [ -z "$output" ]; then
# finish
else
# normal error
fi

Fabian Spreng

Is this also an issue when finishing a release/hotfix branch?

brink-martens

yes. with Intellj-Gitflow Plugin and in Bash.
when i run a 'git status' in bash and finish feature/release/hotfix it works.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.