diff options
| author | Nicolas Pitre <nico@cam.org> | 2005-05-23 21:58:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 19:17:06 -0700 |
| commit | 587e49405be6c4053a69ee8a938660125aa1b51f (patch) | |
| tree | 2c55508ef55d9f87d6a8e09c053096696d255b8d | |
| parent | b1c006dd651fce55e25a7b06d00382cfdc1a3f91 (diff) | |
| download | git-587e49405be6c4053a69ee8a938660125aa1b51f.tar.gz git-587e49405be6c4053a69ee8a938660125aa1b51f.tar.xz | |
[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>
| -rw-r--r-- | git-deltafy-script | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-deltafy-script b/git-deltafy-script index c23f21511..f63cf075e 100644 --- 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 |