Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,256,594
Community Members
 
Community Events
164
Community Groups

Patch containing new files

Hi, I created a patch from a branch that contained both modified and new files, by selecting the files I wanted in the patch and saved it. I then rebased the branch, assuming that the changes can be later introduced into a different branch via the patch. On applying the patch, I realized it only stored the diff of the changed files, but all the new files are missing. As the rebase also rewrote history, there is no way to get my two days of work back.

My questions:

Why weren't the new files added to the patch?

Why was there no warning, that they weren't added even though I had them selected?

1 answer

1 accepted

1 vote
Answer accepted
minnsey Atlassian Team Oct 04, 2018

Hi

I'm sorry that you lost work.

As you rightly suggest Sourcetree should not allow you to select the untracked files if they are not going to be included.

Currently Sourcetree runs

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks diff --no-color HEAD -- {files}

This will only pick up tracked or staged files.

I've put a ticket on our backlog to address this going forward.

Thanks, I think that'll help others who might run into similar issues in the future.

Suggest an answer

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

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

52,040 views 125 26
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