Skip to content

Fixed two more places where SVN/unified diff really wants a tab instead of spaces #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2012
Merged

Fixed two more places where SVN/unified diff really wants a tab instead of spaces #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions git-svn-diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
# - 2011-12-27 Incorporate fixes by https://github.com/nfloyd
# from the Gist comment 2011-07-31 https://gist.github.com/946727
#
# <javabrett>
# - Retain space after leading --- and +++, add TAB before (revision 0)
# <javabrett>
# - Retain space after leading --- and +++, add TAB before (revision 0)
# - Use \t instead of spaces before (revision $REV) and (working copy)

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

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

Expand Down