diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
commit | 0d9d89f61c58f72d96585a61defb0634873c38ac (patch) | |
tree | fcb314481bb669dcf1f33ba3934786c1dcc51b12 /dir.c | |
parent | Merge branch 'jk/terse-push' into aw/mirror-push (diff) | |
parent | Update draft release notes for 1.5.4 (diff) | |
download | tgif-0d9d89f61c58f72d96585a61defb0634873c38ac.tar.xz |
Merge master into aw/mirror-push
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -298,7 +298,8 @@ int excluded(struct dir_struct *dir, const char *pathname) return 0; } -static struct dir_entry *dir_entry_new(const char *pathname, int len) { +static struct dir_entry *dir_entry_new(const char *pathname, int len) +{ struct dir_entry *ent; ent = xmalloc(sizeof(*ent) + len + 1); |