diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2017-05-30 06:55:41 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2017-05-30 06:55:41 +0000 |
| commit | cd7f121138bc82003054e095c068563e48127381 (patch) | |
| tree | 9a9a01132d1d6f3f94d1d0b3ff3b33130df4604b /usr.bin/patch/pch.c | |
| parent | f841d5fa9002f9335cc6dcebbabc605a54538512 (diff) | |
Unbreak previous for git diffs that do not have the a/ prefix.
Found the hard way be me, OK tedu
Diffstat (limited to 'usr.bin/patch/pch.c')
| -rw-r--r-- | usr.bin/patch/pch.c | 4 |
1 files 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 && |