[PATCH] git-am: implement --reject option passed to git-apply
- From
- martin f. krafft <madduck@madduck.net>
- Date
- Jan 23, 2009, 00:31 UTC
- Message-ID
- <1232670681-25781-1-git-send-email-madduck@madduck.net>
With --reject, git-am simply passes the --reject option to git-apply and thus allows people to work with reject files if they so prefer.
The patch does not touch t/t4252-am-options.sh (yet) because I do not really understand how the testing system works.
Signed-off-by: martin f. krafft <madduck@madduck.net>
--- Documentation/git-am.txt | 2 ++ git-am.sh | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 5cbbe76..efd311b 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -12,6 +12,7 @@ SYNOPSIS 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] + [--reject] [<mbox> | <Maildir>...] 'git am' (--skip | --resolved | --abort) @@ -63,6 +64,7 @@ default. You could use `--no-utf8` to override this. -C<n>:: -p<n>:: --directory=<dir>:: +--reject:: These flags are passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies the patch. diff --git a/git-am.sh b/git-am.sh index e20dd88..b1c05c9 100755 --- a/git-am.sh +++ b/git-am.sh @@ -19,6 +19,7 @@ whitespace= pass it through git-apply directory= pass it through git-apply C= pass it through git-apply p= pass it through git-apply +reject pass it through git-apply resolvemsg= override error message when patch failure occurs r,resolved to be used after a patch failure skip skip the current patch @@ -168,6 +169,8 @@ do git_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;; -C|-p) git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;; + --reject) + git_apply_opt="$git_apply_opt $1" ;; --) shift; break ;; *)
-- tg: (9a01387..) git-am--reject (depends on: master)