diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:39:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:39:50 -0800 |
| commit | 092c4be7f5d691809913eb83a2360f035c67ab06 (patch) | |
| tree | 5dfeb837fe69c3295daf4106c06436a16abae7e7 /git-compat-util.h | |
| parent | 5c9c3dfaff886d9882252f03b7f5a11c435f5688 (diff) | |
| parent | a46442f1675722eb68238b329a4a285f03f41dda (diff) | |
| download | git-092c4be7f5d691809913eb83a2360f035c67ab06.tar.gz | |
Merge branch 'jk/blame-commit-label'
"git blame HEAD -- missing" failed to correctly say "HEAD" when it
tried to say "No such path 'missing' in HEAD".
* jk/blame-commit-label:
blame.c: fix garbled error message
use xstrdup_or_null to replace ternary conditionals
builtin/commit.c: use xstrdup_or_null instead of envdup
builtin/apply.c: use xstrdup_or_null instead of null_strdup
git-compat-util: add xstrdup_or_null helper
Diffstat (limited to 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index eb9b0ff328..553fc01762 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -678,6 +678,11 @@ extern char *xgetcwd(void); #define REALLOC_ARRAY(x, alloc) (x) = xrealloc((x), (alloc) * sizeof(*(x))) +static inline char *xstrdup_or_null(const char *str) +{ + return str ? xstrdup(str) : NULL; +} + static inline size_t xsize_t(off_t len) { if (len > (size_t) len) |