Merge branch 'jc/cache-tree' into next

diff --git a/usage.c b/usage.c
index 86211c9141b788f6dbdf7b192f0ac4f4e2527d64..1fa924c3d9ed8f70523685c26cf169316b366598 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include "cache.h"
+#include "git-compat-util.h"
 
 static void report(const char *prefix, const char *err, va_list params)
 {
@@ -15,7 +15,7 @@ static void report(const char *prefix, const char *err, va_list params)
 void usage(const char *err)
 {
        fprintf(stderr, "usage: %s\n", err);
-       exit(1);
+       exit(129);
 }
 
 void die(const char *err, ...)
@@ -25,7 +25,7 @@ void die(const char *err, ...)
        va_start(params, err);
        report("fatal: ", err, params);
        va_end(params);
-       exit(1);
+       exit(128);
 }
 
 int error(const char *err, ...)