Re: [TopGit PATCH 09/10] [RFC] tg-patch: use ui diff when pager is active
- From
Bert Wesarg <bert.wesarg@googlemail.com>
- Date
- Oct 10, 2010, 08:04 UTC
- Message-ID
- <AANLkTikO0bVgwezMP0HT7z1WL68z4hURx3Gb2qVsqw2P@mail.gmail.com>
- In-Reply-To
- <20101009204348.GO29673@pengutronix.de>
2010/10/9 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
Show 8 quoted lines
> Hi Bert, > > > On Fri, Oct 08, 2010 at 09:58:07AM +0200, Bert Wesarg wrote: >> Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> > > can you tell me the motivation for this patch again? It should go into > the commit log, too.
My motivation is, that diff-tree should be used to generate patches meant for submission (or non-human consumption). But for pure human inspection some 'eye-candy' effects could take considerations. Like color, renames, mnemonicprefix, or noprefix. External diff driver or word-diff. All these are in effect by using the diff command, when configured in your git config file. diff-tree does not honor these configure options but its possible to give them as command line options too. Selecting the plumbing or ui diff driver is best done automatically, in my opinion, and the active pager is my best bet that a human will consume the output. I will probably add an overwrite command switch (to enable ui mode even without an active pager, I sometimes pipe the output for inspection into my editor) shortly.
I don't know if this is suitable for the commit log. If so I will try to fit it in.
Bert
Show 35 quoted lines
> > Thanks > Uwe > >> --- >> tg-patch.sh | 7 ++++++- >> 1 files changed, 6 insertions(+), 1 deletions(-) >> >> diff --git a/tg-patch.sh b/tg-patch.sh >> index 9def6e5..dcce672 100644 tg-patch.sh >> --- a/tg-patch.sh >> +++ b/tg-patch.sh >> @@ -70,7 +70,12 @@ t_tree=$(pretty_tree "$name" $head_from) >> if [ $b_tree = $t_tree ]; then >> echo "No changes." >> else >> - git diff-tree -p --stat $b_tree $t_tree >> + # use the ui diff command when the pager is active >> + diff_command=diff >> + [ "x$GIT_PAGER_IN_USE" = "x1" ] || >> + diff_command=diff-tree >> + >> + git $diff_command -p --stat $b_tree $t_tree >> fi >> >> echo '-- ' >> -- >> 1.7.1.1067.g5aeb7 >> >> > > -- > Pengutronix e.K. | Uwe Kleine-König | > Industrial Linux Solutions | http://www.pengutronix.de/ | >