Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Received-SPF: neutral (nike.apache.org: 76.96.27.227 is neither permitted nor
 denied by domain of jim@jagunet.com)
From: Jim Jagielski <jim@jaguNET.com>
Content-Type: multipart/mixed; boundary=Apple-Mail-2-1029709168
Subject: git and httpd
Date: Fri, 14 Jan 2011 09:56:45 -0500
Message-Id: <0AB98DF1-A3D9-4B7A-A6B8-F09AA93E15D4@jaguNET.com>
To: dev@httpd.apache.org
Mime-Version: 1.0 (Apple Message framework v1082)


--Apple-Mail-2-1029709168
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii

For anyone trying out git with the httpd SVN repo, or any other
git-svn user, the lack of 'git svn diff' is a pain.

This helps.

Cheers!


--Apple-Mail-2-1029709168
Content-Disposition: attachment;
	filename=git-svn-diff
Content-Type: application/octet-stream;
	name="git-svn-diff"
Content-Transfer-Encoding: 7bit

#!/usr/bin/env perl
#
# git-svn does not have a 'git svn diff' capability,
# which means you can't see what diffs there are between
# your current git branch and HEAD on svn. This fixes
# that.
#
# Installation:
#   Make sure you have perl
#   Install this script someone along $PATH
#   Add a git alias (edit .gitconfig or use 'git config'):
#       [alias]
#           svn-diff=!git-svn-diff
#
# Now you can 'git svn-diff'
#
#     Jim Jagielski (jim@jaguNET.com)
#
$branch = `git config --get svn-remote.svn.fetch`;
chomp $branch;
$branch =~ s/.*:refs\/remotes\///;

$revbranch = `git rev-list --date-order --max-count=1 $branch`;
chomp $revbranch;
$revnumber = `git svn find-rev $revbranch`;
chomp $revnumber;

open(IN, "git diff --no-prefix $revbranch |");
while (<IN>) {
    # reverse order works best...
    s/^(\+\+\+ .*)/\1    (working copy)/;
    s/^(--- .*)/\1    (revision $revnumber)/;
    s/^diff --git [^[:space:]]*/Index:/;
    s/^index.*/===================================================================/;
    print;
}

--Apple-Mail-2-1029709168--