From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
Cc: git@vger.kernel.org, pasky@suse.cz,
martin f krafft <madduck@madduck.net>,
Bert Wesarg <bert.wesarg@googlemail.com>
Subject: [TopGit PATCH 11/11] [RFC] tg-patch: simulate mnemonic prefixes
Date: Sat, 9 Oct 2010 22:57:02 +0200 [thread overview]
Message-ID: <d9801fe5759b2d40d7bc7497d37545e15293041f.1286657607.git.bert.wesarg@googlemail.com> (raw)
In-Reply-To: <58dbd71af776b1fb088080129a65c623b1dea926.1286657607.git.bert.wesarg@googlemail.com>
In-Reply-To: <e72a55b5f6ca2b805892fd6e214a4f72bf865124.1286657607.git.bert.wesarg@googlemail.com>
b/ is for base, i/ and w/ correspond to -i/-w and t/ is the committed
topic.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
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
[ "x$GIT_PAGER_IN_USE" = "x1" ] ||
diff_command=diff-tree
--
1.7.1.1067.g5aeb7
prev parent reply other threads:[~2010-10-09 21:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-09 20:56 [TopGit PATCH 01/11] cat_file: take -i/-w parameters Bert Wesarg
2010-10-09 20:56 ` [TopGit PATCH 02/11] pretty_tree: globalize and respect -i/-w options Bert Wesarg
2010-10-09 20:56 ` [TopGit PATCH 03/11] branch_empty: use pretty_tree and therefore respect -i/-w Bert Wesarg
2010-10-09 20:56 ` [TopGit PATCH 04/11] tg-path: use pretty_tree and diff-tree to generate the patch Bert Wesarg
2010-10-09 20:56 ` [TopGit PATCH 05/11] list_deps: accept -i/-w Bert Wesarg
2010-10-09 20:56 ` [TopGit PATCH 06/11] tg-summary: " Bert Wesarg
2010-10-09 20:56 ` [TopGit PATCH 07/11] tg-mail: " Bert Wesarg
2010-10-09 20:56 ` [TopGit PATCH 08/11] tg-files: list files changed by the topic branch Bert Wesarg
2010-10-09 20:57 ` [TopGit PATCH 09/11] tg-prev/tg-next: commands to explore dependencies Bert Wesarg
2010-10-09 20:57 ` [TopGit PATCH 10/11] [RFC] tg-patch: use ui diff when pager is active Bert Wesarg
2010-10-09 20:57 ` Bert Wesarg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d9801fe5759b2d40d7bc7497d37545e15293041f.1286657607.git.bert.wesarg@googlemail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=madduck@madduck.net \
--cc=pasky@suse.cz \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).