Re: Warning during 'git stash push'
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 10, 2021, 06:50 UTC
- Message-ID
- <xmqqim4uk4z4.fsf@gitster.g>
- In-Reply-To
- <e493ca9b-c686-68ea-cd8d-c7b13766d65e@rawbw.com>
Yuri <yuri@rawbw.com> writes:
Show 22 quoted lines
> What did you do before the bug happened? (Steps to reproduce your issue) > Tried to stash a particular subdirectory > > What did you expect to happen? (Expected behavior) > Directory should be stashed, obviously, > > What happened instead? (Actual behavior) > git stash push -- x11-toolkits/fltk > Saved working directory and index state WIP on main: 4c2cc95952a6 > graphics/mesa-devel: update to 21.0.b.4390 > <stdin>:83: space before tab in indent. > LIBS="$LIBS -lX11 $X_EXTRA_LIBS" > <stdin>:84: space before tab in indent. > CFLAGS="$CFLAGS $X_CFLAGS" > <stdin>:85: space before tab in indent. > CXXFLAGS="$CXXFLAGS $X_CFLAGS" > <stdin>:88: space before tab in indent. > DSOFLAGS="$X_LIBS $DSOFLAGS" > <stdin>:89: space before tab in indent. > $as_echo "#define USE_X11 1" >>confdefs.h > warning: squelched 40 whitespace errors > warning: 45 lines add whitespace errors.
Thanks for a report.
I wonder if this is one of those regressions introduced during the rewrite.
Not even compile tested, but I think the following patch may be a good starting point to help somebody who wants to fix it (it is too late at night for me ;-).
builtin/stash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git c/builtin/stash.c w/builtin/stash.c index d68ed784d2..c65685de29 100644 --- c/builtin/stash.c +++ w/builtin/stash.c @@ -1510,7 +1510,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q cp_apply.git_cmd = 1; strvec_pushl(&cp_apply.args, "apply", "--index", - "-R", NULL); + "-R", "--whitespace=nowarn", NULL); if (pipe_command(&cp_apply, out.buf, out.len, NULL, 0, NULL, 0)) { ret = -1; @@ -1547,7 +1547,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q struct child_process cp = CHILD_PROCESS_INIT; cp.git_cmd = 1; - strvec_pushl(&cp.args, "apply", "-R", NULL); + strvec_pushl(&cp.args, "apply", "-R", "--whitespace=nowarn", NULL); if (pipe_command(&cp, patch.buf, patch.len, NULL, 0, NULL, 0)) { if (!quiet)