From: Bert Wesarg Date: Sat, 09 Oct 2010 20:57:02 GMT Subject: [TopGit PATCH 11/11] [RFC] tg-patch: simulate mnemonic prefixes Message-ID: In-Reply-To: <58dbd71af776b1fb088080129a65c623b1dea926.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 --- 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