Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

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

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,255 views 4 5
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