# Bug with Git submodules and submodule.recurse setting 5 messages from 2018-08-14 to 2018-08-15. Participants: Jochen Kühner, Stefan Beller, Jonathan Nieder. Thread: https://gitlist.dev/t/49124 ## Jochen Kühner, 2018-08-14 17:54 Subject: Bug with Git submodules and submodule.recurse setting Message-ID: <929572FA-6B1D-4EC7-825B-93B96053A82C@gmx.de> URL: https://gitlist.dev/e/929572FA-6B1D-4EC7-825B-93B96053A82C%40gmx.de ``` If I set    git config --global submodule.recurse true and run git via:   git pull --progress -v --no-rebase "origin" The command will fail with following output (Errorlevel is 1)   Fetching submodule submodules/tstemplates From http://10.0.102.194:7990/scm/mcc/tstemplates = [up to date]      feature/robin -> origin/feature/robin = [up to date]      master        -> origin/master Already up to date. usage: git submodule [--quiet] add [-b ] [-f|--force] [--name ] [--reference ] [--] []    or: git submodule [--quiet] status [--cached] [--recursive] [--] [...]    or: git submodule [--quiet] init [--] [...]    or: git submodule [--quiet] deinit [-f|--force] (--all| [--] ...)    or: git submodule [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference ] [--recursive] [--] [...]    or: git submodule [--quiet] summary [--cached|--files] [--summary-limit ] [commit] [--] [...]    or: git submodule [--quiet] foreach [--recursive]    or: git submodule [--quiet] sync [--recursive] [--] [...]    or: git submodule [--quiet] absorbgitdirs [--] [...]   seams that the “verbose” parameter “-v” is also sent to “git submodules” wich does not support it.   If I remove “-v” it will work.   Problem is, I use TortoiseGit, wich will automatically create this command!   ``` ## Stefan Beller, 2018-08-14 18:22 Subject: [PATCH] git-submodule.sh: accept verbose flag in cmd_update to be non-quiet Message-ID: <20180814182202.59442-1-sbeller@google.com> URL: https://gitlist.dev/e/20180814182202.59442-1-sbeller%40google.com In-Reply-To: <929572FA-6B1D-4EC7-825B-93B96053A82C@gmx.de> ``` In a56771a668d (builtin/pull: respect verbosity settings in submodules, 2018-01-25), we made sure to pass on both quiet and verbose flag from builtin/pull.c to the submodule shell script. However git-submodule doesn't understand a verbose flag, which results in a bug when invoking git pull --recurse-submodules -v [...] There are a few different approaches to fix this bug: 1) rewrite 'argv_push_verbosity' or its caller in builtin/pull.c to cap opt_verbosity at 0. Then 'argv_push_verbosity' would only add '-q' if any. 2) Have a flag in 'argv_push_verbosity' that specifies if we allow adding -q or -v (or both). 3) Add -v to git-submodule.sh and make it a no-op (1) seems like a maintenance burden: What if we add code after the submodule operations or move submodule operations higher up, then we have altered the opt_verbosity setting further down the line in builtin/pull.c. (2) seems like it could work reasonably well without more regressions (3) seems easiest to implement as well as actually is a feature with the last-one-wins rule of passing flags to Git commands. Signed-off-by: Stefan Beller --- On Tue, Aug 14, 2018 at 10:54 AM Jochen Kühner wrote: > > If I set > git config --global submodule.recurse true > and run git via: > git pull --progress -v --no-rebase "origin" > The command will fail with following output (Errorlevel is 1) > Fetching submodule submodules/tstemplates > From http://10.0.102.194:7990/scm/mcc/tstemplates > = [up to date] feature/robin -> origin/feature/robin > = [up to date] master -> origin/master > Already up to date. > usage: git submodule [--quiet] add [-b ] [-f|--force] [--name ] [--reference ] [--] [] > or: git submodule [--quiet] status [--cached] [--recursive] [--] [...] > or: git submodule [--quiet] init [--] [...] > or: git submodule [--quiet] deinit [-f|--force] (--all| [--] ...) > or: git submodule [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference ] [--recursive] [--] [...] > or: git submodule [--quiet] summary [--cached|--files] [--summary-limit ] [commit] [--] [...] > or: git submodule [--quiet] foreach [--recursive] > or: git submodule [--quiet] sync [--recursive] [--] [...] > or: git submodule [--quiet] absorbgitdirs [--] [...] > > seams that the “verbose” parameter “-v” is also sent to “git submodules” wich does not support it. > > If I remove “-v” it will work. > > Problem is, I use TortoiseGit, wich will automatically create this command! git-submodule.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-submodule.sh b/git-submodule.sh index 8b5ad59bdee..f7fd80345cd 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -438,6 +438,9 @@ cmd_update() -q|--quiet) GIT_QUIET=1 ;; + -v) + GIT_QUIET=0 + ;; --progress) progress=1 ;; -- 2.18.0.265.g16de1b435c9.dirty ``` ## Jonathan Nieder, 2018-08-14 18:28 Subject: Re: [PATCH] git-submodule.sh: accept verbose flag in cmd_update to be non-quiet Message-ID: <20180814182807.GA142615@aiede.svl.corp.google.com> URL: https://gitlist.dev/e/20180814182807.GA142615%40aiede.svl.corp.google.com In-Reply-To: <20180814182202.59442-1-sbeller@google.com> ``` Stefan Beller wrote: > git-submodule.sh | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/git-submodule.sh b/git-submodule.sh > index 8b5ad59bdee..f7fd80345cd 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -438,6 +438,9 @@ cmd_update() > -q|--quiet) > GIT_QUIET=1 > ;; > + -v) > + GIT_QUIET=0 > + ;; Reviewed-by: Jonathan Nieder Thanks. ``` ## Jochen Kühner, 2018-08-15 06:27 Subject: Aw: [PATCH] git-submodule.sh: accept verbose flag in cmd_update to be non-quiet Message-ID: URL: https://gitlist.dev/e/trinity-1b5bee3c-e801-483f-b555-7ad0b97f5239-1534314471150%403c-app-gmx-bs78 In-Reply-To: <20180814182202.59442-1-sbeller@google.com> ```   We use git for windows, there I cannot fin the git-submodule.sh! How can I fix it there?   Gesendet: Dienstag, 14. August 2018 um 20:22 Uhr Von: "Stefan Beller" An: jochen.kuehner@gmx.de Cc: git@vger.kernel.org, "Stefan Beller" Betreff: [PATCH] git-submodule.sh: accept verbose flag in cmd_update to be non-quiet In a56771a668d (builtin/pull: respect verbosity settings in submodules, 2018-01-25), we made sure to pass on both quiet and verbose flag from builtin/pull.c to the submodule shell script. However git-submodule doesn't understand a verbose flag, which results in a bug when invoking git pull --recurse-submodules -v [...] There are a few different approaches to fix this bug: 1) rewrite 'argv_push_verbosity' or its caller in builtin/pull.c to cap opt_verbosity at 0. Then 'argv_push_verbosity' would only add '-q' if any. 2) Have a flag in 'argv_push_verbosity' that specifies if we allow adding -q or -v (or both). 3) Add -v to git-submodule.sh and make it a no-op (1) seems like a maintenance burden: What if we add code after the submodule operations or move submodule operations higher up, then we have altered the opt_verbosity setting further down the line in builtin/pull.c. (2) seems like it could work reasonably well without more regressions (3) seems easiest to implement as well as actually is a feature with the last-one-wins rule of passing flags to Git commands. Signed-off-by: Stefan Beller --- On Tue, Aug 14, 2018 at 10:54 AM Jochen Kühner wrote: > > If I set > git config --global submodule.recurse true > and run git via: > git pull --progress -v --no-rebase "origin" > The command will fail with following output (Errorlevel is 1) > Fetching submodule submodules/tstemplates > From http://10.0.102.194:7990/scm/mcc/tstemplates > = [up to date] feature/robin -> origin/feature/robin > = [up to date] master -> origin/master > Already up to date. > usage: git submodule [--quiet] add [-b ] [-f|--force] [--name ] [--reference ] [--] [] > or: git submodule [--quiet] status [--cached] [--recursive] [--] [...] > or: git submodule [--quiet] init [--] [...] > or: git submodule [--quiet] deinit [-f|--force] (--all| [--] ...) > or: git submodule [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference ] [--recursive] [--] [...] > or: git submodule [--quiet] summary [--cached|--files] [--summary-limit ] [commit] [--] [...] > or: git submodule [--quiet] foreach [--recursive] > or: git submodule [--quiet] sync [--recursive] [--] [...] > or: git submodule [--quiet] absorbgitdirs [--] [...] > > seams that the “verbose” parameter “-v” is also sent to “git submodules” wich does not support it. > > If I remove “-v” it will work. > > Problem is, I use TortoiseGit, wich will automatically create this command! git-submodule.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-submodule.sh b/git-submodule.sh index 8b5ad59bdee..f7fd80345cd 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -438,6 +438,9 @@ cmd_update() -q|--quiet) GIT_QUIET=1 ;; + -v) + GIT_QUIET=0 + ;; --progress) progress=1 ;; -- 2.18.0.265.g16de1b435c9.dirty   ``` ## Stefan Beller, 2018-08-15 22:52 Subject: Re: [PATCH] git-submodule.sh: accept verbose flag in cmd_update to be non-quiet Message-ID: URL: https://gitlist.dev/e/CAGZ79kZdeqHrc0aREuez9FQjEc%3D2-b2%2Bt3FGCd01ob%2B1aAX65g%40mail.gmail.com In-Reply-To: ``` On Tue, Aug 14, 2018 at 11:27 PM "Jochen Kühner" wrote: > > > > > We use git for windows, there I cannot fin the git-submodule.sh! How can I fix it there? > > It probably doesn't have the .sh extension. I don't know where all git executables are located in GfW. Maybe "dir /s git.exe" can give you a starting point to look for the executables of Git. (courtesy stackoverflow, I am no expert on Windows) As git-submodule is a shell script and doesn't need compilation, you can just edit this in to see if it fixes the problem; mind to use a text editor that doesn't put CRLF, but LF line endings only in that file ... shell script is not the most portable. ```