Marcel Holtmann <marcel@holtmann.org> wrote Mon, May 30, 2005: > with the latest cg-update and pulling the linux-2.6 repository I saw > problems with deleted files: Update tree_timewarp()s git-diff-tree logic to handle the diff-format header and file both being NUL separated. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> --- I've only tested it in a small test script ... diff --git a/cg-Xlib b/cg-Xlib --- a/cg-Xlib +++ b/cg-Xlib @@ -73,10 +73,15 @@ tree_timewarp () { echo "$branch" > $_git/HEAD # Kill gone files - git-diff-tree -z -r $base $branch | egrep -z '^:([^ ][^ ]* ){4}D' | xargs -0 bash -c ' + git-diff-tree -r $base $branch | xargs -0 bash -c ' while [ "$1" ]; do - rm -- "$(echo "$1" | cut -f 2)" - shift + header="$1"; shift + file="$1"; shift + + # match ":100755 000000 14d43b1abf... 000000000... D" + if echo "$header" | egrep "^:([^ ][^ ]* ){4}D" >/dev/null; then + rm -- "$file" + fi done ' padding git-checkout-cache -f -a -- Jonas Fonseca - 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.htmlReceived on Tue May 31 02:40:18 2005
This archive was generated by hypermail 2.1.8 : 2005-05-31 02:40:19 EST