projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bda02eb 178e1de)
Merge branch 'jn/maint-fast-import-empty-ls' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Mar 2012 19:10:25 +0000 (12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Mar 2012 19:10:25 +0000 (12:10 -0700)
* 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

1  2 
fast-import.c patch | diff1 | diff2 | blob | history
t/t9300-fast-import.sh patch | diff1 | diff2 | blob | history

diff --cc fast-import.c
Simple merge
diff --cc t/t9300-fast-import.sh
Simple merge
Git—the stupid content tracker