Re: [PATCH] Make filter-branch work with many branches

From: Johannes Sixt <j6t@kdbg.org>
Date: Jul 19, 2011, 18:06 UTC
Message-ID: <4E25C78A.1090600@kdbg.org>
In-Reply-To: <E186982C-71AE-4C08-B857-A67BDCD21E3D@apple.com>

Am 19.07.2011 18:29, schrieb Dave Zarzycki:

Show 5 quoted lines

> -rev_args=$(git rev-parse --revs-only "$@")
> -
>  case "$filter_subdir" in
>  "")
>  	eval set -- "$(git rev-parse --sq --no-revs "$@")"

This line in the hunk context changes what "$@" will produce. Therefore, the "$@" that you removed above will not produce the same thing...

Show 8 quoted lines

> @@ -286,8 +284,8 @@ case "$filter_subdir" in
>  	;;
>  esac
>  
> -git rev-list --reverse --topo-order --default HEAD \
> -	--parents --simplify-merges $rev_args "$@" > ../revs ||
> +git rev-parse --revs-only "$@" | git rev-list --stdin --reverse --topo-order \
> +	--default HEAD --parents --simplify-merges "$@" > ../revs ||

... that you insert here. How can the result ever have worked for you?

Perhaps store the list of revs in a temporary file?

-- Hannes