Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
wt-status.h: declare global variables as extern
builtin-commit.c: add -u as short name for --untracked-files
git-repack: re-enable parsing of -n command line option

diff --git a/builtin-commit.c b/builtin-commit.c
index 52a05c20bbf4d6d70ac293e3960ead33454357fa..e3564a526a29927702e2aab368feae3e641c1256 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -101,7 +101,7 @@ static struct option builtin_commit_options[] = {
        OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
        OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
        OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
-       OPT_BOOLEAN(0, "untracked-files", &untracked_files, "show all untracked files"),
+       OPT_BOOLEAN('u', "untracked-files", &untracked_files, "show all untracked files"),
        OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"),
        OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
 

diff --git a/git-repack.sh b/git-repack.sh
index e18eb3f5dcf42abfbd125594877ececf92c3d9b6..501519ab6897c2463c054e3f7310efc6721c432f 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -11,6 +11,7 @@ a               pack everything in a single pack
 A               same as -a, and keep unreachable objects too
 d               remove redundant packs, and run git-prune-packed
 f               pass --no-reuse-delta to git-pack-objects
+n               do not run git-update-server-info
 q,quiet         be quiet
 l               pass --local to git-pack-objects
  Packing constraints

diff --git a/wt-status.h b/wt-status.h
index 02afaa60eee74018e074a4dcb3bec97c2e0ce9dc..7d61410b1733825e3bb8042781a75de3ee62c41d 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -28,8 +28,8 @@ struct wt_status {
 };
 
 int git_status_config(const char *var, const char *value);
-int wt_status_use_color;
-int wt_status_relative_paths;
+extern int wt_status_use_color;
+extern int wt_status_relative_paths;
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);