Skip to content

Commit f7f3666

Browse files
committed
Merge pull request jwiegley#14 from javabrett/more-tab-fixes
Fixed two more places where SVN/unified diff really wants a tab instead of spaces
2 parents 0d59fbb + a7f9d49 commit f7f3666

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

git-svn-diff

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
# - 2011-12-27 Incorporate fixes by https://github.com/nfloyd
2323
# from the Gist comment 2011-07-31 https://gist.github.com/946727
2424
#
25-
# <javabrett>
26-
# - Retain space after leading --- and +++, add TAB before (revision 0)
25+
# <javabrett>
26+
# - Retain space after leading --- and +++, add TAB before (revision 0)
27+
# - Use \t instead of spaces before (revision $REV) and (working copy)
2728

2829
# Get the tracking branch (if we're on a branch)
2930

@@ -53,8 +54,8 @@ git diff \
5354
--no-prefix $(git rev-list --date-order --max-count=1 $TRACKING_BRANCH) \
5455
"$@" |
5556
sed -e "/--- \/dev\/null/{ N; s|^--- /dev/null\n+++ \(.*\)|--- \1\t(revision 0)\n+++ \1\t(revision 0)|;}" \
56-
-e "s/^--- .*/& (revision $REV)/" \
57-
-e "s/^+++ .*/& (working copy)/" \
57+
-e "s/^--- .*/&\t(revision $REV)/" \
58+
-e "s/^+++ .*/&\t(working copy)/" \
5859
-e "s/^diff --git [^[:space:]]*/Index:/" \
5960
-e "s/^index.*/===================================================================/"
6061

0 commit comments

Comments
 (0)