Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git

1 files changed, 1 insertions, 1 deletions

diff --git a/apply.c b/apply.c
index 3ebbf6b1dc..e87190ea38 100644
--- a/apply.c
+++ b/apply.c
@@ -1377,7 +1377,7 @@ static struct excludes {
 
 static int use_patch(struct patch *p)
 {
-	const char *pathname = p->new_name ? : p->old_name;
+	const char *pathname = p->new_name ? p->new_name : p->old_name;
 	struct excludes *x = excludes;
 	while (x) {
 		if (fnmatch(x->path, pathname, 0) == 0)