Re: [PATCH 0/6] Initial subproject support (RFC?)
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Apr 10, 2007, 20:11 UTC
- Message-ID
- <Pine.LNX.4.64.0704101302480.6730@woody.linux-foundation.org>
- In-Reply-To
- <7v6484vxd5.fsf@assigned-by-dhcp.cox.net>
On Tue, 10 Apr 2007, Junio C Hamano wrote:
> > Well, I was planning to apply this directly on 'master' after > giving them another pass.
Goodie. I gave them another pass myself, and noticed a small leak and a stupid copy-paste problem, fixed thus..
Linus
---
diff --git a/read-cache.c b/read-cache.c index 8fe94cd..f458f50 100644 --- a/read-cache.c +++ b/read-cache.c @@ -279,7 +279,7 @@ int base_name_compare(const char *name1, int len1, int mode1, c2 = name2[len]; if (!c1 && (S_ISDIR(mode1) || S_ISDIRLNK(mode1))) c1 = '/'; - if (!c2 && (S_ISDIR(mode2) || S_ISDIRLNK(mode1))) + if (!c2 && (S_ISDIR(mode2) || S_ISDIRLNK(mode2))) c2 = '/'; return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0; } diff --git a/refs.c b/refs.c index 229da74..11a67a8 100644 --- a/refs.c +++ b/refs.c @@ -229,6 +229,7 @@ static int resolve_gitlink_packed_ref(char *name, int pathlen, const char *refna if (!f) return -1; read_packed_refs(f, &refs); + fclose(f); ref = refs.packed; retval = -1; while (ref) {