Skip to content

Instantly share code, notes, and snippets.

@tbroyer

tbroyer/git-svn-diff.sh

Forked from mojodna/git-svn-diff.sh
Created January 25, 2011 16:58
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save tbroyer/795208 to your computer and use it in GitHub Desktop.
Save tbroyer/795208 to your computer and use it in GitHub Desktop.
Download ZIP
git-svn-diff.sh
Raw
gistfile1.sh
#!/bin/sh
#
# git-svn-diff
# Generate an SVN-compatible diff against the tip of the tracking branch
TRACKING_BRANCH=`git config --get svn-remote.svn.fetch | sed -e 's/.*:refs\/remotes\///'`
REV=`git svn find-rev $(git rev-list --date-order --max-count=1 $TRACKING_BRANCH)`
git diff --no-prefix $(git rev-list --date-order --max-count=1 $TRACKING_BRANCH) $* |
sed -e "s/^+++ .*/& (working copy)/" -e "s/^--- .*/& (revision $REV)/" \
-e "s/^diff --git [^[:space:]]*/Index:/" \
-e "s/^index.*/===================================================================/"
@markjaquith
Copy link

Line 26 has a sed syntax issue that prevents it from running on my OS X setup. I get this error:

sed: 1: "/--- \/dev\/null/{ N; s ...": bad flag in substitute command: '}'

You need a semicolon before the ending curly brace. Fixed here in my fork.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment