[PATCH] adjust git-deltafy-script to the new diff-tree output format

Also prevent 'sort' from sorting on the sha1 which was screwing the
history listing.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/git-deltafy-script b/git-deltafy-script
index c23f215119c51a3f8cfb0c4225af0c3be972f592..f63cf075ec3f350036c7654606424b5be5a2abbb 100644 (file)
--- a/git-deltafy-script
+++ b/git-deltafy-script
@@ -23,8 +23,9 @@ curr_file=""
 
 git-rev-list HEAD |
 git-diff-tree -r --stdin |
-sed -n '/^\*/ s/^.*->\(.\{41\}\)\(.*\)$/\2 \1/p' | sort | uniq |
-while read file sha1; do
+awk '/^:/ { if ($5 == "M" || $5 == "N") print $4, $6 }' |
+LC_ALL=C sort -s -k 2 | uniq |
+while read sha1 file; do
        if [ "$file" == "$curr_file" ]; then
                list="$list $sha1"
        else