While fixing up some debugging cruft, this slipped in.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@xxxxxx>
---
One day I will learn not to send off things when too tired.
*sigh*
builtin-merge-one-file.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin-merge-one-file.c b/builtin-merge-one-file.c
index 5f74c6b..75774ce 100644
--- a/builtin-merge-one-file.c
+++ b/builtin-merge-one-file.c
@@ -25,7 +25,7 @@ int cmd_merge_one_file(int argc, const char **argv, const char *prefix)
for (i = 0; i < 3; i++) {
char *p;
hashes[i] = buffers[i];
- if (!*argv[i + 1] || *argv[i + 1])
+ if (!argv[i + 1] || !*argv[i + 1])
hashes[i] = NULL;
else if (get_sha1_hex(argv[i + 1], buffers[i]))
return error("invalid hash: %s\n", argv[i + 1]);
--
1.5.0.rc2.gee75e-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html