summaryrefslogtreecommitdiff
path: root/builtin/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-17 23:00:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-17 23:00:56 (GMT)
commitba0254cb32537b7a7e92854a51256475ee83cdda (patch)
tree6e8bcfa99201c20d8647600e74b78e580cfd23cf /builtin/send-pack.c
parente2110c8d881eb61db581b6b9ddd9568f20cf24c7 (diff)
parent55846b9abd128185388418e025651cfd6a299a0e (diff)
downloadgit-ba0254cb32537b7a7e92854a51256475ee83cdda.zip
git-ba0254cb32537b7a7e92854a51256475ee83cdda.tar.gz
git-ba0254cb32537b7a7e92854a51256475ee83cdda.tar.bz2
Merge branch 'tr/maint-merge-file-subdir'
* tr/maint-merge-file-subdir: merge-file: correctly find files when called in subdir prefix_filename(): safely handle the case where pfx_len=0
Diffstat (limited to 'builtin/send-pack.c')
0 files changed, 0 insertions, 0 deletions