From: Junio C Hamano <junkio@cox.net>
Date: Thu, 9 Feb 2006 08:55:45 +0000 (-0800)
Subject: Merge branch 'jc/nostat'
X-Git-Tag: v1.3.0-rc1~54^2~90
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0509ef3d211a94658d68705bb852b7f94a3ac684?hp=b92b2ce94e5673ab3a2fbc9c762b39aaf7d72de5

Merge branch 'jc/nostat'

* jc/nostat:
"Assume unchanged" git: --really-refresh fix.
---

diff --git a/ident.c b/ident.c
index 0461b8b2f8..23b8cfc600 100644
--- a/ident.c
+++ b/ident.c
@@ -167,6 +167,11 @@ static const char *get_ident(const char *name, const char *email,
 		name = git_default_name;
 	if (!email)
 		email = git_default_email;
+
+	if (!*name || !*email)
+		die("empty ident %s <%s> not allowed",
+		    name, email);
+
 	strcpy(date, git_default_date);
 	if (date_str)
 		parse_date(date_str, date, sizeof(date));
diff --git a/ls-files.c b/ls-files.c
index 3f06ece84d..1c8ab73989 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -490,8 +490,28 @@ static void show_files(void)
 		const char *path = ".", *base = "";
 		int baselen = prefix_len;
 
-		if (baselen)
+		if (baselen) {
 			path = base = prefix;
+			if (exclude_per_dir) {
+				char *p, *pp = xmalloc(baselen+1);
+				memcpy(pp, prefix, baselen+1);
+				p = pp;
+				while (1) {
+					char save = *p;
+					*p = 0;
+					push_exclude_per_directory(pp, p-pp);
+					*p++ = save;
+					if (!save)
+						break;
+					p = strchr(p, '/');
+					if (p)
+						p++;
+					else
+						p = pp + baselen;
+				}
+				free(pp);
+			}
+		}
 		read_directory(path, base, baselen);
 		qsort(dir, nr_dir, sizeof(struct nond_on_fs *), cmp_name);
 		if (show_others)
diff --git a/t/t6000lib.sh b/t/t6000lib.sh
index 01f796e9c8..c6752af48e 100755
--- a/t/t6000lib.sh
+++ b/t/t6000lib.sh
@@ -51,7 +51,12 @@ as_author()
 
 	export GIT_AUTHOR_EMAIL="$_author"
 	"$@"
-        export GIT_AUTHOR_EMAIL="$_save"
+	if test -z "$_save"
+	then
+		unset GIT_AUTHOR_EMAIL
+	else
+		export GIT_AUTHOR_EMAIL="$_save"
+	fi
 }
 
 commit_date()