Re: Using kdiff3 to compare two different revisions of a folder

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: André <andre.goddard@...>
Cc: Git Mailing List <git@...>
Date: Wednesday, February 13, 2008 - 1:44 pm

On Tue, Feb 12, 2008 at 11:44:07PM -0200, André Goddard Rosa wrote:

Maybe you want something like this?  This uses kdiff3 to compare two
full commits, by extracting the changed files into a temporary location.
Modifying it so it can work with path limiters and/or take arguments
exactly like 'git diff' is left as an excercise for the reader.

-bcd

#!/bin/sh -e

# usage: git-kdiff3 commit1 commit2

SUBDIRECTORY_OK=1
. git-sh-setup
cd_to_toplevel

O=".git-kdiff3-tmp-$$"
list="$O/list"
trap "rm -rf $O" 0
mkdir $O

git diff --name-only -z $1 $2 > $list

cat $list | xargs -0 git archive --prefix=a/ $1 | tar xf - -C $O
cat $list | xargs -0 git archive --prefix=b/ $2 | tar xf - -C $O

kdiff3 $O/a $O/b
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Using kdiff3 to compare two different revisions of a folder, André Goddard Rosa, (Tue Feb 12, 9:44 pm)
Re: Using kdiff3 to compare two different revisions of a fol..., André Goddard Rosa, (Wed Feb 13, 8:36 pm)
Re: Using kdiff3 to compare two different revisions of a fol..., André Goddard Rosa, (Sun Feb 17, 7:35 am)
Re: Using kdiff3 to compare two different revisions of a fol..., Brian Downing, (Wed Feb 13, 1:44 pm)
Re: Using kdiff3 to compare two different revisions of a fol..., André Goddard Rosa, (Wed Feb 13, 8:37 pm)