It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

SourceTree Fails to Stage Modified Files Edited

I use SourceTree daily and never had such issue. But today I did some minor change and now I ended up having this issue:

What I changed today?

I added p4Merge as merge tool and diff tool in my git config. Then I changed my mind and deleted entries for p4Merge from my /.gitconfig file since I noticed I ended up having double entries for merge and diff tools there.

Neither SourceTree staging nor issuing git add . in terminal will stage files.  I have been able to rename file, then git will see that change and I can add, commit, then rename back and add and commit again to fix this issue.  But this issue keeps reoccuring, so this fix is not really fixing it.

Here is how that looked

enter image description here

However, after removing all entries for p4Merge tool, I noticed that I am unable to stage files from SourceTree anymore. Below screenshot shows that I have 4 upstaged files. If I try to stage them by checking off the checkbox beside them, nothing will happen. The wont be moved to Staged files section

enter image description here

1 answer

0 votes
Manju Atlassian Team Oct 22, 2018

Could you please update to the latest version and try this action from the File Status side bar item? It shouldn't make a difference whether you are on File status or History, but just for the sake of getting a better view since File status is all about modified files both staged and unstaged. 

latest version of what?

what action?  and what do you mean from file status bar item?

Deleted user Dec 28, 2018

@ManjuI tried as you suggested:

  1. Updated to the very latest version today
  2. Clicked on File Status on the left side bar
  3. Then checked box next to unstaged file (this file shows in both staged and unstaged areas of SourceTree for some reason)
  4. I would expect it would move this file from unstaged to staged area but did did not happen, all I saw is brief busy circle in source tree but the file was not moved
  5. Repeated same from History but no changes

Attached screenshot shows just couple of files in red square that show in both staged and unstaged areas but adding/staging is not working on any of them.  Same issue if I try to stage files from terminal using git add . command.

SourceTree.png

Deleted user Dec 31, 2018

... what is even more confusing is that git ls-files --stage lists all files as doubled but the guid is same

 

dinosmbp:source dinob$ cd SquirrelFOH/
dinosmbp:SquirrelFOH dinob$ git ls-files --stage
100644 a658bb41271a4285977d1074a69f3302ab5cc15e 0    .gitignore
100644 a658bb41271a4285977d1074a69f3302ab5cc15e 0    .gitignore
100644 197079698252f7f85d6b1e3f68582b9cd1a9288b 0    Publishing/GooglePlay/Icons/res/mipmap-hdpi/icon.png
100644 197079698252f7f85d6b1e3f68582b9cd1a9288b 0    Publishing/GooglePlay/Icons/res/mipmap-hdpi/icon.png
100644 f03e22933ff168571cc5efac90fd4a9bbb4e5968 0    Publishing/GooglePlay/Icons/res/mipmap-mdpi/icon.png
100644 f03e22933ff168571cc5efac90fd4a9bbb4e5968 0    Publishing/GooglePlay/Icons/res/mipmap-mdpi/icon.png
100644 9f8a69a800369b1fd37061b46e808c62747115ac 0    Publishing/GooglePlay/Icons/res/mipmap-xhdpi/icon.png
100644 9f8a69a800369b1fd37061b46e808c62747115ac 0    Publishing/GooglePlay/Icons/res/mipmap-xhdpi/icon.png
100644 64c4174f8086fb7788c5ca922fd4411d8f5050ac 0    Publishing/GooglePlay/Icons/res/mipmap-xxhdpi/icon.png
100644 64c4174f8086fb7788c5ca922fd4411d8f5050ac 0    Publishing/GooglePlay/Icons/res/mipmap-xxhdpi/icon.png
100644 97a01523dd3909b8361d96c1ebd69373db33983f 0    Publishing/GooglePlay/Icons/res/mipmap-xxxhdpi/icon.png
100644 97a01523dd3909b8361d96c1ebd69373db33983f 0    Publishing/GooglePlay/Icons/res/mipmap-xxxhdpi/icon.png
100644 ab64f8448c2d2c74564c00f1cd1aca8bf1dbf200 0    Publishing/GooglePlay/Icons/web_hi_res_512.png
100644 ab64f8448c2d2c74564c00f1cd1aca8bf1dbf200 0    Publishing/GooglePlay/Icons/web_hi_res_512.png

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,989 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you