Re: [PATCH] am: Allow passing exclude and include args to apply

[Thiago Farina <tfransosi@xxxxxxxxx>]

On Sun, Dec 19, 2010 at 2:17 PM, maximilian attems <max@xxxxxxx> wrote:
> When porting patches from dash git to klibc git,
> where dash has a different directory structure those
> switches are handy:
> Exported with format-patch on dash side and used am
> as import for klibc side.
>

I don't know, but this commit message doesn't look good. Can you be
more specific about what the patch does, and what it's trying to fix.
Describing a use case is good, but in this case it isn't help me much
(maybe for others the issue here is clear, but for my taste no).

> Signed-off-by: maximilian attems <max@xxxxxxx>
> ---
> ÂDocumentation/git-am.txt | Â Â5 ++++-
> Âgit-am.sh        Â|  Â4 +++-
> Â2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
> index 51297d0..4c65dba 100644
> --- a/Documentation/git-am.txt
> +++ b/Documentation/git-am.txt
> @@ -13,7 +13,8 @@ SYNOPSIS
> Â Â Â Â [--3way] [--interactive] [--committer-date-is-author-date]
> Â Â Â Â [--ignore-date] [--ignore-space-change | --ignore-whitespace]
> Â Â Â Â [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
> - Â Â Â Â[--reject] [-q | --quiet] [--scissors | --no-scissors]
> + Â Â Â Â[--exclude=PATH] [--include=PATH] [--reject] [-q | --quiet]
> + Â Â Â Â[--scissors | --no-scissors]
> Â Â Â Â [(<mbox> | <Maildir>)...]
> Â'git am' (--continue | --skip | --abort)
>
> @@ -87,6 +88,8 @@ default. Â You can use `--no-utf8` to override this.
> Â-C<n>::
> Â-p<n>::
> Â--directory=<dir>::
> +--exclude=<path-pattern>::
> +--include=<path-pattern>::
> Â--reject::
> Â Â Â ÂThese flags are passed to the 'git apply' (see linkgit:git-apply[1])
> Â Â Â Âprogram that applies
> diff --git a/git-am.sh b/git-am.sh
> index df09b42..174f6a2 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -22,6 +22,8 @@ whitespace= Â Â pass it through git-apply
> Âignore-space-change pass it through git-apply
> Âignore-whitespace pass it through git-apply
> Âdirectory= Â Â Âpass it through git-apply
> +exclude= Â Â Â Âpass it through git-apply
> +include= Â Â Â Âpass it through git-apply
> ÂC= Â Â Â Â Â Â Âpass it through git-apply
> Âp= Â Â Â Â Â Â Âpass it through git-apply
> Âpatch-format= Â format the patch(es) are in
> @@ -340,7 +342,7 @@ do
> Â Â Â Â Â Â Â Â;;
> Â Â Â Â--resolvemsg)
> Â Â Â Â Â Â Â Âshift; resolvemsg=$1 ;;
> - Â Â Â --whitespace|--directory)
> + Â Â Â --whitespace|--directory|--exclude|--include)
> Â Â Â Â Â Â Â Âgit_apply_opt="$git_apply_opt $(sq "$1=$2")"; shift ;;
> Â Â Â Â-C|-p)
> Â Â Â Â Â Â Â Âgit_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
> --
> 1.7.2.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html