Skip to content

Instantly share code, notes, and snippets.

@tangqiaoboy
Forked from MikePearce/git-svn-diff.sh
Created February 14, 2012 10:20
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save tangqiaoboy/1825519 to your computer and use it in GitHub Desktop.
Save tangqiaoboy/1825519 to your computer and use it in GitHub Desktop.
生成git-svn下svn兼容的diff文件
#!/bin/bash
# Get the tracking branch (if we're on a branch)
TRACKING_BRANCH=`git svn info | grep URL `
# 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 find-rev $(git rev-list --date-order --max-count=1 $TRACKING_BRANCH)`
# Then do the diff from the highest revition on the current 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.*/===================================================================/"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment