Alex Riesen, Wed, Jun 28, 2006 11:34:23 +0200: > >> > - use a pipe to "git-update-index --index-info" instead of > >> > using command line > > ...and to take it a step further, a patch (0002) to avoid too many calls to > git-write-tree and to git-update-index. Brought merge times on my test > monster (~25k files) down to 2min 30sec (from something around 11 min). this broke t6022-merge-rename.sh (the second test). It produces an index with this: .../t/trash$ git-diff-index white :100644 100644 2d603156dc5bdf6295c789cac08e3c9942a0b82a 0000000000000000000000000000000000000000 M B :100644 100644 ba41fb96393979b22691106b06bf5231eab57b85 0000000000000000000000000000000000000000 M N whereas git-merge-recursive (and the previous version, without pipe): .../t/trash$ git-diff-index white :100644 100644 2d603156dc5bdf6295c789cac08e3c9942a0b82a 0000000000000000000000000000000000000000 M B I can see that "git update-index --add" is somehow different from a pipe to "git update-index --index-info", but not very clear. Does this "zero-sha1" mean that the file "N" is not in the index? - 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 Thu Jun 29 10:26:43 2006
This archive was generated by hypermail 2.1.8 : 2006-06-29 10:27:08 EST