[kernel] r16730 - people/benh

[Ben Hutchings]

Author: benh
Date: Wed Dec 22 04:37:37 2010
New Revision: 16730

Log:
Set context for git-am to 2, consistent with patch options

Modified:
   people/benh/debian-kernel-patches-to-git

Modified: people/benh/debian-kernel-patches-to-git
==============================================================================
--- people/benh/debian-kernel-patches-to-git	Wed Dec 22 03:46:48 2010	(r16729)
+++ people/benh/debian-kernel-patches-to-git	Wed Dec 22 04:37:37 2010	(r16730)
@@ -19,6 +19,7 @@
 set -e
 
 PATCH_OPTS='-p1 -f -s -t --no-backup-if-mismatch'
+GIT_AM_OPTS='-C2'
 GIT_RM_OPTS='-r --ignore-unmatch'
 export GIT_COMMITTER_NAME='debian-kernel-patches-to-git'
 export GIT_COMMITTER_EMAIL='debian-kernel at lists.debian.org'
@@ -27,7 +28,7 @@
 export GIT_AUTHOR_EMAIL='debian-kernel at lists.debian.org'
 
 apply_patch() {
-    if git am "$1"; then
+    if git am $GIT_AM_OPTS "$1"; then
 	return
     fi
     git am --abort || true