aboutsummaryrefslogtreecommitdiffstats
path: root/shallow.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-01-12 20:59:09 -0500
committerJunio C Hamano <gitster@pobox.com>2015-01-13 10:05:48 -0800
commit8c53f0719b04e0b6328c2e175e3c5d2dc8a0c282 (patch)
tree85489f2b619c708e7583929d30991ac6d336532f /shallow.c
parenteaa541eb59aefa2c5e9e160c36a259d372c25711 (diff)
downloadgit-8c53f0719b04e0b6328c2e175e3c5d2dc8a0c282.tar.gz
use xstrdup_or_null to replace ternary conditionals
This replaces "x ? xstrdup(x) : NULL" with xstrdup_or_null(x). The change is fairly mechanical, with the exception of resolve_refdup, which can eliminate a temporary variable. There are still a few hits grepping for "?.*xstrdup", but these are of slightly different forms and cannot be converted (e.g., "x ? xstrdup(x->foo) : NULL"). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'shallow.c')
-rw-r--r--shallow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shallow.c b/shallow.c
index 57f4afa6b4..ee14574334 100644
--- a/shallow.c
+++ b/shallow.c
@@ -21,7 +21,7 @@ void set_alternate_shallow_file(const char *path, int override)
if (alternate_shallow_file && !override)
return;
free(alternate_shallow_file);
- alternate_shallow_file = path ? xstrdup(path) : NULL;
+ alternate_shallow_file = xstrdup_or_null(path);
}
int register_shallow(const unsigned char *sha1)