From: W. Trevor King <wking@drexel.edu>
Date: Mon, 30 Jan 2012 04:20:47 +0000 (-0500)
Subject: Use '-p1' instead of '-p0' for patching.
X-Git-Tag: v0.3~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=515d0723165461ff22b0b45119344d8464313c97;p=dotfiles-framework.git

Use '-p1' instead of '-p0' for patching.

This allows for patches like

  --- a/.dir_colors ...
  +++ b/.dir_colors ...

which I like better than

  --- .dir_colors ...
  +++ somewhere-else/.dir_colors ...
---

diff --git a/dotfiles.sh b/dotfiles.sh
index 63d0ade..6bd279d 100755
--- a/dotfiles.sh
+++ b/dotfiles.sh
@@ -476,7 +476,7 @@ function patch()
 		if [ -f "${FILE}" ]; then
 			echo "apply ${FILE}"
 			pushd "${REPO}/patched-src/" > /dev/null || return 1
-			"${PATCH}" -p0 < "../../${FILE}" || return 1
+			"${PATCH}" -p1 < "../../${FILE}" || return 1
 			popd > /dev/null || return 1
 		fi
 	done