Git and KDiff3
I wrote a small patch for yakuake. Yakuake still uses subversion (because KDE still uses SVN, but it will switch to git) I tried the SVN mercurial plugin. Well, for some reason it failed ("abort: None" wtf?) so I tried the git SVN plugin. Well, I like hg a bit more than git but whatever. There are both good DSCMs.
Because I like to use kdiff3 to view changes I googled how to use it with git. I found this message and extended the script:
Because I like to use kdiff3 to view changes I googled how to use it with git. I found this message and extended the script:
#!/bin/sh -e
# Usage: git kdiff3 [commit1 [commit2]]
SUBDIRECTORY_OK=1
. "`git --exec-path`/git-sh-setup" || exit 1
cd_to_toplevel
O=".git-kdiff3-tmp-$$"
list=$O/.git-kdiff3-list
trap "rm -rf $O" 0
mkdir $O || exit 1
function diff_working_copy () {
git diff --name-only -z "$1" > $list || exit 1
xargs --arg-file=$list -0 git archive --prefix=a/ "$1" | tar xf - -C $O || exit 1
{ cat $list; printf '\0'; } | while read -r -d '' fname; do
if [ -e "$fname" ]; then
dir=`dirname "$fname"`
dest="$O/b/$dir"
mkdir -p "$dest" || exit 1
cp "$fname" "$dest" || exit 1
fi
done
}
case $# in
2)
git diff --name-only -z "$1" "$2" > $list || exit 1
xargs --arg-file=$list -0 git archive --prefix=a/ "$1" | tar xf - -C $O || exit 1
xargs --arg-file=$list -0 git archive --prefix=b/ "$2" | tar xf - -C $O || exit 1
;;
1)
diff_working_copy "$1"
;;
0)
diff_working_copy master
;;
*)
echo >&2 "error: illegal number of arguments"
exit 1
;;
esac
if [ -e $O/a -a -e $O/b ]; then
kdiff3 $O/a $O/b
exit $?
fi
When you copy it to `git --exec-path`/git-kdiff3 you can use it by issuing the command git kdiff3.panzi - 15. Nov, 01:27
