[TopGit RFC/PATCH v3 12/12] tg-patch: simulate mnemonic prefixes
- From
Bert Wesarg <bert.wesarg@googlemail.com>
- Date
- Oct 20, 2010, 20:17 UTC
- Message-ID
- <24183272016f41b5351f25e5143043a9f3327a78.1287605587.git.bert.wesarg@googlemail.com>
- In-Reply-To
- <cb28181bc3cc0cfbf19926aa9dabf3d1d1f643b0.1287605587.git.bert.wesarg@googlemail.com>
b/ is for base, i/ and w/ correspond to -i/-w and t/ is the committed topic.
diff.mnemonicprefix needs to be set to true. See git-config(1) for more information.
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 --- 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.3.1.1069.g89486