summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-03-19 15:45:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-03 11:34:22 -0700
commit16d41d42184a4c82d2cd8c41e9eef9784cf437b1 (patch)
treed3d0bd2e238b3b2aa68479bd742a663356bfc558
parentadd: add a blank line at the end of pathless 'add [-u|-A]' warning (diff)
downloadtgif-16d41d42184a4c82d2cd8c41e9eef9784cf437b1.tar.xz
add: make warn_pathless_add() a no-op after first call
Make warn_pathless_add() print its warning the first time it is called and do nothing if called again. This will make it easier to show the warning on the fly when a relevant condition is detected without risking showing it multiple times when multiple such conditions hold. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/add.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/add.c b/builtin/add.c
index c13d548585..bfc6ff3b0a 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -33,8 +33,13 @@ static const char *short_option_with_implicit_dot;
static void warn_pathless_add(void)
{
+ static int shown;
assert(option_with_implicit_dot && short_option_with_implicit_dot);
+ if (shown)
+ return;
+ shown = 1;
+
/*
* To be consistent with "git add -p" and most Git
* commands, we should default to being tree-wide, but