Re: [PATCH 0/6] Initial subproject support (RFC?)

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH 0/6] Initial subproject support (RFC?)

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:03

Linus Torvalds [off-list ref] writes:
On Tue, 10 Apr 2007, Alex Riesen wrote:
quoted
It is already "merged somewhere": as soon as the patches left landed
on vger, it is not possible to loose (and even destroy) them.
The feature is just too much sought after.
Well, unless it hits something like Junios 'pu' (or 'next') branch, or 
somebody (like you?) ends up maintaining a repo with this, it's just 
unnecessarily hard to have lots of people working together on it..
Well, I was planning to apply this directly on 'master' after
giving them another pass.

Re: [PATCH 0/6] Initial subproject support (RFC?)

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: 2016-06-15 22:43:03


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) {
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help