Merge branch 'maint'

gitster · gitster · commit 065b0702f748 · 2009-05-20T18:59:09.000-07:00
* maint:
  grep: fix word-regexp colouring
  completion: use git rev-parse to detect bare repos
  Cope better with a _lot_ of packs
  for-each-ref: fix segfault in copy_email
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
@@ -339,8 +339,11 @@ static const char *copy_name(const char *buf)
 static const char *copy_email(const char *buf)
 {
 	const char *email = strchr(buf, '<');
-	const char *eoemail = strchr(email, '>');
-	if (!email || !eoemail)
+	const char *eoemail;
+	if (!email)
+		return "";
+	eoemail = strchr(email, '>');
+	if (!eoemail)
 		return "";
 	return xmemdupz(email, eoemail + 1 - email);
 }
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -132,7 +132,7 @@ __git_ps1 ()
 		local c
 
 		if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
-			if [ "true" = "$(git config --bool core.bare 2>/dev/null)" ]; then
+			if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
 				c="BARE:"
 			else
 				b="GIT_DIR!"
diff --git a/grep.c b/grep.c
@@ -305,6 +305,7 @@ static int match_one_pattern(struct grep_pat *p, char *bol, char *eol,
 {
 	int hit = 0;
 	int saved_ch = 0;
+	const char *start = bol;
 
 	if ((p->token != GREP_PATTERN) &&
 	    ((p->token == GREP_PATTERN_HEAD) != (ctx == GREP_CONTEXT_HEAD)))
@@ -365,6 +366,10 @@ static int match_one_pattern(struct grep_pat *p, char *bol, char *eol,
 	}
 	if (p->token == GREP_PATTERN_HEAD && saved_ch)
 		*eol = saved_ch;
+	if (hit) {
+		pmatch[0].rm_so += bol - start;
+		pmatch[0].rm_eo += bol - start;
+	}
 	return hit;
 }
 
diff --git a/sha1_file.c b/sha1_file.c
@@ -720,6 +720,8 @@ static int open_packed_git_1(struct packed_git *p)
 		return error("packfile %s index unavailable", p->pack_name);
 
 	p->pack_fd = open(p->pack_name, O_RDONLY);
+	while (p->pack_fd < 0 && errno == EMFILE && unuse_one_window(p, -1))
+		p->pack_fd = open(p->pack_name, O_RDONLY);
 	if (p->pack_fd < 0 || fstat(p->pack_fd, &st))
 		return -1;
 
@@ -937,6 +939,8 @@ static void prepare_packed_git_one(char *objdir, int local)
 	sprintf(path, "%s/pack", objdir);
 	len = strlen(path);
 	dir = opendir(path);
+	while (!dir && errno == EMFILE && unuse_one_window(packed_git, -1))
+		dir = opendir(path);
 	if (!dir) {
 		if (errno != ENOENT)
 			error("unable to open object pack directory: %s: %s",
@@ -2339,6 +2343,8 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
 
 	filename = sha1_file_name(sha1);
 	fd = create_tmpfile(tmpfile, sizeof(tmpfile), filename);
+	while (fd < 0 && errno == EMFILE && unuse_one_window(packed_git, -1))
+		fd = create_tmpfile(tmpfile, sizeof(tmpfile), filename);
 	if (fd < 0) {
 		if (errno == EACCES)
 			return error("insufficient permission for adding an object to repository database %s\n", get_object_directory());

Original file line number	Diff line number	Diff line change
`@@ -339,8 +339,11 @@ static const char copy_name(const char buf)`
`339`	`339`	`static const char copy_email(const char buf)`
`340`	`340`	`{`
`341`	`341`	`const char *email = strchr(buf, '<');`
`342`		`- const char *eoemail = strchr(email, '>');`
`343`		`- if (!email \|\| !eoemail)`
	`342`	`+ const char *eoemail;`
	`343`	`+ if (!email)`
	`344`	`+ return "";`
	`345`	`+ eoemail = strchr(email, '>');`
	`346`	`+ if (!eoemail)`
`344`	`347`	`return "";`
`345`	`348`	`return xmemdupz(email, eoemail + 1 - email);`
`346`	`349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -305,6 +305,7 @@ static int match_one_pattern(struct grep_pat p, char bol, char *eol,`
`305`	`305`	`{`
`306`	`306`	`int hit = 0;`
`307`	`307`	`int saved_ch = 0;`
	`308`	`+ const char *start = bol;`
`308`	`309`
`309`	`310`	`if ((p->token != GREP_PATTERN) &&`
`310`	`311`	`((p->token == GREP_PATTERN_HEAD) != (ctx == GREP_CONTEXT_HEAD)))`
`@@ -365,6 +366,10 @@ static int match_one_pattern(struct grep_pat p, char bol, char *eol,`
`365`	`366`	`}`
`366`	`367`	`if (p->token == GREP_PATTERN_HEAD && saved_ch)`
`367`	`368`	`*eol = saved_ch;`
	`369`	`+ if (hit) {`
	`370`	`+ pmatch[0].rm_so += bol - start;`
	`371`	`+ pmatch[0].rm_eo += bol - start;`
	`372`	`+ }`
`368`	`373`	`return hit;`
`369`	`374`	`}`
`370`	`375`