Gitup: Get 'Working directory contains modified files' message when it's not true

Created on 8 Mar 2018  路  7Comments  路  Source: git-up/GitUp

I tried to do 'Split' a commit and got the error message 'Working directory contains modified files'.

But I had just done a 'git stash' and 'git diff' shows nothing.

question

Most helpful comment

untracked files count as modified files for GitUp

Why? They don't count for git -- I can rebase with untracked files present.

At the very least, you need to change the 'Working directory contains modified files', as it's incorrect. You're trying to say that the working directory contains modified or untracked files.

All 7 comments

What if you relaunch GitUp?

No change.
Getting this again with the 'Swap with parent' command.

What if you git status?

What does the commit window show in GitUp? It would tell you what has changed.

Git status said there are no modified files (but lots of untracked ones).

I'll check the commit window next time this happens.

There you have it: untracked files count as modified files for GitUp. Bottom line your repo is not clean.

untracked files count as modified files for GitUp

Why? They don't count for git -- I can rebase with untracked files present.

At the very least, you need to change the 'Working directory contains modified files', as it's incorrect. You're trying to say that the working directory contains modified or untracked files.

I am also still seeing this even without any untracked files, but with submodules in the git repo that may be out-of-date.

EDIT: I was able to force 'Swap with parent's by doing consecutive rm -rf <submodule_dir> and git reset --hard HEAD commands before quickly switching to the Gitup window and doing that swap. After 2 seconds or so, it would then again block with the warning 'Working directory contains modified files'.

Was this page helpful?
0 / 5 - 0 ratings

Related issues

brandedoutcast picture brandedoutcast  路  3Comments

lyqeyes picture lyqeyes  路  6Comments

adius picture adius  路  5Comments

swisspol picture swisspol  路  7Comments

FadeFei picture FadeFei  路  5Comments