nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

"This is not a valid patch file." for a patch file that I just created.

cdbarlow

No matter what I do, it says:

This is not a valid patch file.

I just created a patch file from either a working copy or a commit using Create Patch yet it says that. I used to use patch files all the time for several years this way but now I can never get the Apply Patch to work.

Accepted answers

All comments

bgannin

Hi Christopher,

What version of Sourcetree are you using? What platform are you on?

Brian Ganninger
Senior Mac Developer, Sourcetree

Greg_Harrington

I am having the same issue. Version:

MacOS

3.0.1 (205)

dancorp0711

Same problem here too. I had to roll back to 2.x to get patching to work.

jamesgosbell

I also get this issue. I create a patch file the usual way through sourcetree but I can't apply it.

Mac OS

3.0.1 (205)

Emre Serbetcioglu

I'm having the same issue.

macOS Mojave(10.14.2)

SourceTree v 3.0.1 (205)

Omid Zamani

same here.

Charlie McGeorge

I had the same issue on MacOS 10.14.2 and SourceTree 3.0.1 (205).

I downloaded SourceTree 3.0.0 (300) and the same issue was present there as well.

I downloaded SourceTree 2.7.4 (175) and the patch functionality worked fine. Patches generated by 2.7.4 and even patches generated by 3.0.0 were applied correctly. This would imply that the message "This is not a valid patch file" is actually incorrect and the bug is in the patch file parser, not the patch file generator. Hope this helps.

Greg Harrington

Does anyone know how to get SourceTree's attention on this bug?

Kubilay Erdogan

So it turns out that it's not a bug but a feature(!). When it's not working copy, Sourcetree appends more info to the patch file (then it's not a patch file anymore...) so when I remove those information, the patch works fine.

For instance, here is the patch file Sourcetree creates from an old commit:

From 24e5d114c5809c3cad52f1c2ef693fa07b84cb7e Mon Sep 17 00:00:00 2001
From: Kubilay Erdogan <>
Date: Thu, 21 Feb 2019 15:42:23 +0100
Subject: [PATCH] Add todo.

---
project/Class.swift | 1 +
1 files changed, 1 insertions(+)

diff --git a/project/Class.swift b/project/Class.swift
index 00806946..742f52ef 100644
--- a/project/Class.swift
+++ b/project/Class.swift
@ extension Class {
case foo

// New definitions
+ // TODO: Create documentation for these

case bar

-- 
2.18.0

And I get "This is not a valid patch file" error when I try to apply the patch.

But if I remove the header and footer info (Text before the first `diff` and the last two lines (double dashes and version info(?)) then it works.

So the working patch file is:

diff --git a/project/Class.swift b/project/Class.swift
index 00806946..742f52ef 100644
--- a/project/Class.swift
+++ b/project/Class.swift
@ extension Class {
case foo

// New definitions
+ // TODO: Create documentation for these

case bar

Hope this helps someone.

Sven Burkert

Same here. Patch created by SourceTree can be applied in console with "git apply".

Simon Salomons

You just saved me a full days work. Thank you!

Deniss Kaibagarovs

You are the best!

kobizz

I'm having the same issue. Just wondering how long it will take to the SourceTree team to 'apply a patch' and resolve that annoying bug.

SourceTree 3.0.1 (205) on macOS Mojave (10.14.4)

Pierre-Yves Bertholon

I've the issue in May 2019.

- Sourcetree Mac 3.1.2 (216).

- Use embedded Git 2.20.1.

- macOS Mojave (10.14.3)

The test to reproduce it:

- "Actions / Create Patch…". Save the patch file.

- "Actions / Apply Patch…". Select the previous created patch file.

gchaney

Ran into same problem today several times. SourceTree 3.1.2 on a Mac.

My patch includes diff for four files.

I tried the suggestion above "remove the header and footer info (Text before the first `diff` and the last two lines (double dashes and version info(?))" . but the file still does not work, i still get "this is not a valid patch file"

Deniss Kaibagarovs

Charlie McGeorge

Fixed in 3.2!

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree