From c82b07be71cfe981278e978d12e5cab728feab31 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 30 May 2017 06:55:40 +0000 Subject: [PATCH] Unbreak previous for git diffs that do not have the a/ prefix. Found the hard way be me, OK tedu --- usr.bin/patch/pch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index 4cd2073c6c6..cc9047cfa8c 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pch.c,v 1.57 2017/05/26 20:27:02 tedu Exp $ */ +/* $OpenBSD: pch.c,v 1.58 2017/05/30 06:55:40 florian Exp $ */ /* * patch - a program to apply diffs to original files @@ -327,7 +327,7 @@ intuit_diff_type(void) free(revision); revision = NULL; } - } else if (strnEQ(s, "diff --git ", 11)) + } else if (strnEQ(s, "diff --git a/", 13)) piece_of_git = 1; if ((!diff_type || diff_type == ED_DIFF) && first_command_line >= 0 && -- 2.20.1