[kernel-team] 03/47: Set context for git-am to 2, consistent with patch options

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository kernel-team.

commit 150486e9ca7639e7d4a424cd8c5b1400f8c42087
Author: Ben Hutchings <benh at debian.org>
Date:   Wed Dec 22 04:37:37 2010 +0000

    Set context for git-am to 2, consistent with patch options
    
    svn path=/people/benh/; revision=16730
---
 scripts/benh/debian-kernel-patches-to-git | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/benh/debian-kernel-patches-to-git b/scripts/benh/debian-kernel-patches-to-git
index 2ed6265..85edce9 100755
--- a/scripts/benh/debian-kernel-patches-to-git
+++ b/scripts/benh/debian-kernel-patches-to-git
@@ -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_NAME='Debian kernel team'
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/kernel-team.git