Teach git-am to pass -p option down to git-apply

This is originally from Andy Parkins whose patch used --patchdepth; let's
use -p which is more in line with the underlying git-apply.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 77ef103b21ed7c8864cf05c08efe3ae562357f55..4fb1d844133ba8350361ee67d074935805a24156 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -10,7 +10,8 @@ SYNOPSIS
 --------
 [verse]
 'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
 --------
 [verse]
 'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]

-         [--interactive] [--whitespace=<option>] <mbox>...
+         [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>]
+        <mbox>...

 'git-am' [--skip | --resolved]
 
 DESCRIPTION
 'git-am' [--skip | --resolved]
 
 DESCRIPTION


@@ -68,8 +69,8 @@ default.   You could use `--no-utf8` to override this.
        This flag is passed to the `git-apply` program that applies
        the patch.
 
        This flag is passed to the `git-apply` program that applies
        the patch.
 

--C<n>::
-       This flag is passed to the `git-apply` program that applies
+-C<n>, -p<n>::
+       These flag are passed to the `git-apply` program that applies

        the patch.
 
 --interactive::
        the patch.
 
 --interactive::

diff --git a/git-am.sh b/git-am.sh
index 9a6123437ea092069fc2c0c29349252f31efd496..6db9cb503a2717d0c45ee40e262747cbeba3ad17 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005, 2006 Junio C Hamano
 
 USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
 # Copyright (c) 2005, 2006 Junio C Hamano
 
 USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]

-  [--interactive] [--whitespace=<option>] [-CNUM] <mbox>...
+  [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>...

   or, when resuming [--skip | --resolved]'
 . git-sh-setup
 set_reflog_action am
   or, when resuming [--skip | --resolved]'
 . git-sh-setup
 set_reflog_action am


@@ -142,10 +142,7 @@ do
        --sk|--ski|--skip)
        skip=t; shift ;;
 
        --sk|--ski|--skip)
        skip=t; shift ;;
 

-       --whitespace=*)
-       git_apply_opt="$git_apply_opt $1"; shift ;;
-
-       -C*)
+       --whitespace=*|-C*|-p*)

        git_apply_opt="$git_apply_opt $1"; shift ;;
 
        --resolvemsg=*)
        git_apply_opt="$git_apply_opt $1"; shift ;;
 
        --resolvemsg=*)