Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Patch containing new files

Andreas Beer October 2, 2018

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
Atlassian Team members are employees working across the company in a wide variety of roles.
October 4, 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.

Andreas Beer October 4, 2018

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
AUG Leaders

Atlassian Community Events