path: root/Documentation/diff-options.txt
diff options
authorJunio C Hamano <>2012-03-16 15:19:18 (GMT)
committerJunio C Hamano <>2012-03-16 15:19:18 (GMT)
commit5087aace2d5467046c7204e038009b30fdebbca6 (patch)
tree4a52d848cf86e97556676b89ff726bfcb7f1cddd /Documentation/diff-options.txt
parenta99c5e5921fcb4fd003fd3424be4db649393731f (diff)
parent178e1deaae33f879ea687e85ac72455b3072b0d8 (diff)
Merge "two fixes for fast-import's 'ls' command" from Jonathan
Andrew Sayers noticed that the svn-fe | git fast-import pipeline mishandles a subversion history that copies the root directory to a sub-directory (e.g. doing `svn cp . trunk` to standardise your layout). As David Barr explained, the bug arises when the following command is sent to git fast-import: 'ls' SP ':1' SP LF Instead of reading back what is at the root of r1, it unconditionally reports the path as missing. After sleeping on it, here are two patches for 'maint'. One plugs a memory leak. The other ensures that trying to pass an empty path to the 'ls' command results in an error message that can help the frontend author instead of the silently broken conversion Andrew found. Then we can carefully add 'ls ""' support in 1.7.11. * commit 'refs/pull-request-tags/jn/maint-fast-import-empty-ls': fast-import: don't allow 'ls' of path with empty components fast-import: leakfix for 'ls' of dirty trees
Diffstat (limited to 'Documentation/diff-options.txt')
0 files changed, 0 insertions, 0 deletions