Thread (57 messages) 57 messages, 6 authors, 2017-08-02

Re: [PATCH] convert any hard coded .gitmodules file string to the MACRO

flat view

From: Jeff Hostetler <hidden>
Date: 2017-08-01 13:41:32


On 7/31/2017 7:11 PM, Stefan Beller wrote:
quoted hunk ↗ jump to hunk
I used these commands:
   $ cat sem.cocci
   @@
   @@
   - ".gitmodules"
   + GITMODULES_FILE

   $ spatch --in-place --sp-file sem.cocci builtin/*.c *.c *.h

Feel free to regenerate or squash it in or have it as a separate commit.

Signed-off-by: Stefan Beller <redacted>
---
  submodule.c    | 18 +++++++++---------
  unpack-trees.c |  2 +-
  2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/submodule.c b/submodule.c
index 37f4a92872..b75d02ba7b 100644
--- a/submodule.c
+++ b/submodule.c
  
@@ -233,18 +233,18 @@ void gitmodules_config(void)
  		strbuf_addstr(&gitmodules_path, "/.gitmodules");
Did you mean to also change "/.gitmodules" ??
quoted hunk ↗ jump to hunk
  		if (read_cache() < 0)
  			die("index file corrupt");
-		pos = cache_name_pos(".gitmodules", 11);
+		pos = cache_name_pos(GITMODULES_FILE, 11);
  		if (pos < 0) { /* .gitmodules not found or isn't merged */
  			pos = -1 - pos;
  			if (active_nr > pos) {  /* there is a .gitmodules */
It might also be nice to change the literals in the comments to
use the macro.

Jeff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help