2010/10/9 Uwe Kleine-KÃnig <u.kleine-koenig@xxxxxxxxxxxxxx>:
> On Fri, Oct 08, 2010 at 09:58:08AM +0200, Bert Wesarg wrote:
>> b/ is for base, i/ and w/ correspond to -i/-w and t/ is the committed
>> topic.
>>
>> Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx>
>> ---
>> Âtg-patch.sh | Â Â8 ++++++--
>> Â1 files changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/tg-patch.sh b/tg-patch.sh
>> index dcce672..c8ad723 100644 tg-patch.sh
>> --- a/tg-patch.sh
>> +++ b/tg-patch.sh
>> @@ -6,7 +6,7 @@
>> Âname=
>>
>> Âhead_from=
>> -
>> +dst_prefix="t/"
>>
>> Â## Parse options
>>
>> @@ -15,7 +15,8 @@ while [ -n "$1" ]; do
>> Â Â Â case "$arg" in
>> Â Â Â -i|-w)
>> Â Â Â Â Â Â Â [ -z "$head_from" ] || die "-i and -w are mutually exclusive"
>> - Â Â Â Â Â Â head_from="$arg";;
>> + Â Â Â Â Â Â head_from="$arg"
>> + Â Â Â Â Â Â dst_prefix="${arg#-}/";;
>> Â Â Â -*)
>> Â Â Â Â Â Â Â echo "Usage: tg [...] patch [-i | -w] [NAME]" >&2
>> Â Â Â Â Â Â Â exit 1;;
>> @@ -72,6 +73,9 @@ if [ $b_tree = $t_tree ]; then
>> Âelse
>> Â Â Â # use the ui diff command when the pager is active
>> Â Â Â diff_command=diff
>> + Â Â if $(git config --bool diff.mnemonicprefix); then
>> + Â Â Â Â Â Â diff_command="$diff_command --src-prefix=b/ --dst-prefix=$dst_prefix"
>> + Â Â fi
> Do I assume right, that diff.mnemonicprefix is topgitish only? Â Maybe
> it should go then into a topgit namespace?
No. it is from git. From the manual:
diff.mnemonicprefix
If set, git diff uses a prefix pair that is different from the
standard "a/" and "b/" depending on what is being compared. When
this configuration is in effect, reverse diff output also swaps the
order of the prefixes:
git diff
compares the (i)ndex and the (w)ork tree;
git diff HEAD
compares a (c)ommit and the (w)ork tree;
git diff --cached
compares a (c)ommit and the (i)ndex;
git diff HEAD:file1 file2
compares an (o)bject and a (w)ork tree entity;
git diff --no-index a b
compares two non-git things (1) and (2).
And it is only a diff ui option too. I thought to take c/ for the
committed case for us too, but I have also no strong opinion about t/
either.
>
> Hmm, nice idea, the only thing about it I don't like ad hoc is that b/
> is already used by default and so it might be confusing. ÂOTOH you need
> to enabled it in the config, ... ÂHmm, will think about it.
>
> Uwe
--
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