summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-29 06:02:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-29 06:02:01 (GMT)
commit10d781b9caa4f71495c7b34963bef137216f86a8 (patch)
treeeec73f3aec2ea1255bb3e131bd54e0a04e64d0f2 /apply.c
parent928f74de22536129b696218073a3940ae4ab1199 (diff)
parentfb2af0375bcef9f5f5cbb1f4dc9f81459ce1f4b1 (diff)
downloadgit-10d781b9caa4f71495c7b34963bef137216f86a8.zip
git-10d781b9caa4f71495c7b34963bef137216f86a8.tar.gz
git-10d781b9caa4f71495c7b34963bef137216f86a8.tar.bz2
Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 3ebbf6b..e87190e 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)