Re: [PATCH] convert any hard coded .gitmodules file string to the MACRO
- From
- Jeff Hostetler <git@jeffhostetler.com>
- Date
- Aug 1, 2017, 13:14 UTC
- Message-ID
- <413e4f55-5f8b-a80f-775b-b456c4de8a46@jeffhostetler.com>
- In-Reply-To
- <20170731231142.15053-1-sbeller@google.com>
On 7/31/2017 7:11 PM, Stefan Beller wrote:
Show 24 quoted lines
> 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 <sbeller@google.com> > --- > 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" ??
Show 7 quoted lines
> 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