git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/4] add: make warn_pathless_add() a no-op after first call

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Mar 19, 2013, 03:46 UTC
Message-ID
<20130319034636.GK5062@elie.Belkin>
In-Reply-To
<20130319034415.GI5062@elie.Belkin>

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>
---
 builtin/add.c | 5 +++++
 1 file changed, 5 insertions(+)
diff --git a/builtin/add.c b/builtin/add.c
index a4028eea..a424e69d 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
-- 
1.8.2.rc3
Previous: Jonathan NiederNext: Jonathan Nieder
Message 26 of 51 in “"git add -u/-A" from future”
  1. 0/2 "git add -u/-A" from futureJunio C Hamano, Mar 8, 2013
  2. 1/2 require pathspec for "git add -u/-A"Junio C Hamano, Mar 8, 2013
  3. Matthieu MoyMar 10, 2013
  4. Junio C HamanoMar 11, 2013
  5. Matthieu MoyMar 11, 2013
  6. 1/2 add: update pathless 'add [-u|-A]' warning to reflect change of planMatthieu Moy, Mar 11, 2013
  7. 2/2 add: add a newline at the end of pathless 'add [-u|-A]' warningMatthieu Moy, Mar 11, 2013
  8. Junio C HamanoMar 11, 2013
  9. Matthieu MoyApr 2, 2013
  10. Junio C HamanoApr 2, 2013
  11. Matthieu MoyApr 2, 2013
  12. Jeff KingMar 12, 2013
  13. Matthieu MoyMar 12, 2013
  14. Jeff KingMar 13, 2013
  15. 1/2 t2200: check that "add -u" limits itself to subdirectoryJeff King, Mar 13, 2013
  16. Matthieu MoyMar 13, 2013
  17. Junio C HamanoMar 13, 2013
  18. Jeff KingMar 14, 2013
  19. 2/2 add: respect add.updateroot config optionJeff King, Mar 13, 2013
  20. Matthieu MoyMar 13, 2013
  21. Jeff KingMar 13, 2013
  22. Junio C HamanoMar 13, 2013
  23. Matthieu MoyMar 14, 2013
  24. 0/4 make pathless 'add [-u|-A]' warning less noisyJonathan Nieder, Mar 19, 2013
  25. 1/4 add: make pathless 'add [-u|-A]' warning a file-global functionJonathan Nieder, Mar 19, 2013
  26. 2/4 add: make warn_pathless_add() a no-op after first callJonathan Nieder, Mar 19, 2013
  27. 3/4 add -u: only show pathless 'add -u' warning when changes exist outside cwdJonathan Nieder, Mar 19, 2013
  28. Junio C HamanoMar 19, 2013
  29. Jonathan NiederMar 19, 2013
  30. Junio C HamanoMar 19, 2013
  31. Jonathan NiederMar 19, 2013
  32. Duy NguyenMar 19, 2013
  33. Jonathan NiederMar 19, 2013
  34. Matthieu MoyMar 19, 2013
  35. Junio C HamanoMar 19, 2013
  36. Jonathan NiederMar 19, 2013
  37. Junio C HamanoMar 19, 2013
  38. Jonathan NiederMar 19, 2013
  39. 4/4 add -A: only show pathless 'add -A' warning when changes exist outside cwdJonathan Nieder, Mar 19, 2013
  40. Jeff KingMar 19, 2013
  41. 2/2 git add: -u/-A now affects the entire working treeJunio C Hamano, Mar 8, 2013
  42. 0/6 make pathless 'add [-u|-A]' warning less noisyJonathan Nieder, Mar 19, 2013
  43. 1/6 t2200: check that "add -u" limits itself to subdirectoryJonathan Nieder, Mar 19, 2013
  44. 2/6 add: make pathless 'add [-u|-A]' warning a file-global functionJonathan Nieder, Mar 19, 2013
  45. 3/6 add: make warn_pathless_add() a no-op after first callJonathan Nieder, Mar 19, 2013
  46. 4/6 add -u: only show pathless 'add -u' warning when changes exist outside cwdJonathan Nieder, Mar 19, 2013
  47. Jeff KingMar 20, 2013
  48. Junio C HamanoMar 20, 2013
  49. 5/6 add -A: only show pathless 'add -A' warning when changes exist outside cwdJonathan Nieder, Mar 19, 2013
  50. Junio C HamanoMar 20, 2013
  51. 6/6 git add: -u/-A now affects the entire working treeJonathan Nieder, Mar 19, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.