From 2b36b146fa892a0a326eb2e35a39c9daf58fbe5e Mon Sep 17 00:00:00 2001 From: A Large Angry SCM Date: Sat, 10 May 2008 16:52:51 -0400 Subject: [PATCH 1/3] git-repack: re-enable parsing of -n command line option In commit 5715d0b (Migrate git-repack.sh to use git-rev-parse --parseopt, 2007-11-04), parsing of the '-n' command line option was accidentally lost when git-repack.sh was migrated to use git-rev-parse --parseopt. This adds it back. Signed-off-by: A Large Angry SCM Signed-off-by: Junio C Hamano --- git-repack.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-repack.sh b/git-repack.sh index e18eb3f5dc..501519ab68 100755 --- 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 From e1645901ed72f82ae55139bbae01eac1bf5899c9 Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Fri, 9 May 2008 22:42:55 +0530 Subject: [PATCH 2/3] builtin-commit.c: add -u as short name for --untracked-files This makes the C code consistent with the documentation and the old shell code. Signed-off-by: Sitaram Chamarty Signed-off-by: Junio C Hamano --- builtin-commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin-commit.c b/builtin-commit.c index a2da314ac6..2f4d6cc87e 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -100,7 +100,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"), From 32efcd91c6505ae28f87c0e9a3e2b3c0115017d8 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Fri, 9 May 2008 10:05:27 +0200 Subject: [PATCH 3/3] wt-status.h: declare global variables as extern There are linkers out there that complain if a global non-static variable is defined multiple times. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- wt-status.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wt-status.h b/wt-status.h index 02afaa60ee..7d61410b17 100644 --- 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);