Created
May 24, 2013 16:29
-
-
Save rinatkhaziev/5644717 to your computer and use it in GitHub Desktop.
Format git diff in svn patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# | |
# git-svn-diff originally by (http://mojodna.net/2009/02/24/my-work-git-workflow.html) | |
# modified by [email protected] | |
# modified by aconway@[redacted] - handle diffs that introduce new files | |
# | |
# Generate an SVN-compatible diff against the tip of the tracking branch | |
# Get the tracking branch (if we're on a branch) | |
TRACKING_BRANCH=`git svn info | grep URL | sed -e 's/.*\/branches\///'` | |
# If the tracking branch has 'URL' at the beginning, then the sed wasn't successful and | |
# we'll fall back to the svn-remote config option | |
if [[ "$TRACKING_BRANCH" =~ URL.* ]] | |
then | |
TRACKING_BRANCH=`git config --get svn-remote.svn.fetch | sed -e 's/.*:refs\/remotes\///'` | |
fi | |
# Get the highest revision number | |
REV=`git svn info | grep 'Last Changed Rev:' | sed -E 's/^.*: ([[:digit:]]*)/\1/'` | |
# Then do the diff from the highest revision on the current branch | |
# and masssage into SVN format | |
git diff --no-prefix $(git rev-list --date-order --max-count=1 $TRACKING_BRANCH) $* | | |
sed -e "/--- \/dev\/null/{ N;G; s|^--- /dev/null\n+++ \(.*\)\(\n\)|--- \1 (revision 0)\2+++ \1 (revision 0)|;}" \ | |
-e "/new file mode [0-9]*/{ N; s/new file mode [0-9]*\n//;}" \ | |
-e "s/^--- .*/& (revision $REV)/" \ | |
-e "s/^+++ .*/& (working copy)/" \ | |
-e "s/\(^--- .* (revision 0)\) (revision $REV)/\1/" \ | |
-e "s/^diff --git [^[:space:]]*/Index:/" \ | |
-e "s/^index.*/===================================================================/" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment