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

On Tue, Aug 1, 2017 at 6:14 AM, Jeff Hostetler [off-list ref] wrote:

On 7/31/2017 7:11 PM, Stefan Beller wrote:

quoted

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" ??

Goog point. We should pick that up as well. However as we do not have
a macro for that, we'd have to have 2 calls to strbuf API

    strbuf_addch(&sb, '/');
    strbuf_addstr(&sb, GITMODULES);

quoted

                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.

Yes, I wondered if sed would have been better for this job.

Jeff