summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJason Riedy <ejr@cs.berkeley.edu>2005-08-23 20:34:07 (GMT)
committerJason Riedy <ejr@cs.berkeley.edu>2005-08-24 03:41:12 (GMT)
commitc7c81b3a51de2778535c8bb18d42a4bb7dfd57bc (patch)
tree78e210d8703959d13f476205e48d5e9125166296 /apply.c
parent6c5f9baa3bc0d63e141e0afc23110205379905a4 (diff)
downloadgit-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.zip
git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.gz
git-c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc.tar.bz2
Fix ?: statements.
Omitting the first branch in ?: is a GNU extension. Cute, but not supported by other compilers. Replaced mostly by explicit tests. Calls to getenv() simply are repeated on non-GNU compilers. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
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 7c1a841..ee59be6 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)