git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [GSoC] [PATCH 1/1] t0001: replace "test [-d|-f]" with test_path_is_* functions

From
Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
Date
Feb 14, 2022, 08:53 UTC
Message-ID
<CAJyCBOTg+5m6s6Nw+ma4Y7RgMe_0GmjyN_f+BBeEc-BhzJi_Qw@mail.gmail.com>
In-Reply-To
<CAP8UFD3=kd8ACA8PPHyV7fCYLuJSb4Qj2OSdBFJ3RHtnwbGO2A@mail.gmail.com>

On Mon, Feb 14, 2022 at 4:45 PM Christian Couder <christian.couder@gmail.com> wrote:

Show 20 quoted lines
>
> On Mon, Feb 14, 2022 at 9:32 AM Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> wrote:
> > On Fri, Feb 11, 2022 at 1:23 AM Junio C Hamano <gitster@pobox.com> wrote:
> > > FWIW, I have the posted patch plus the following SQUASH??? fix-up
> >
> > I'm not so sure what does "SQUASH???" mean especially the three
> > question marks, i.e. is it just an incidental text or a commit message
> > convention?
>
> It means that you might want to squash the fix-up commit or a similar
> commit into your commit (or one of your commits in case of a
> commit/patch series), and then resubmit a new version.
>
> > Is it for the convenience of grepping through the
> > "git log" outputs (cause I found the commit 50d631c71c right away by
> > grepping through the "git log" output)?
>
> It is for convenience that it's named "SQUASH???" as everyone (who is
> familiar with the mailing list) then knows what needs to be done on
> the proposed commit(s).
Yeah, now I see :)
Show 6 quoted lines
> > > parked in the 'seen' branch.  As the script is quiescent right now,
> > > I do not mind merging it down, now we spent more time on it ;-)
>
> Alternatively as Junio says he is ok with merging that down, you might
> just accept his offer and he will squash the "SQUASH???" commit for
> you before merging the result into the "next" branch.

Yeah, I saw the squashed version in the latest "What's cooking in git.git". Thanks for the help and suggestions :)

-- 
Thanks & Regards,
Shaoxuan
Previous: Christian Couder
Message 13 of 13 in “t0001: replace "test [-d|-f]" with test_path_is_* functions”
  1. Shaoxuan YuanJan 21, 2022
  2. [GSoC] [PATCH 1/1] t0001: replace "test [-d|-f]" with test_path_is_* functionsShaoxuan Yuan, Jan 21, 2022
  3. Taylor BlauJan 21, 2022
  4. Junio C HamanoJan 21, 2022
  5. Shaoxuan YuanJan 24, 2022
  6. Shaoxuan YuanFeb 10, 2022
  7. Junio C HamanoFeb 10, 2022
  8. Shaoxuan YuanFeb 10, 2022
  9. Junio C HamanoFeb 10, 2022
  10. Shaoxuan YuanFeb 11, 2022
  11. Junio C HamanoFeb 11, 2022
  12. Christian CouderFeb 14, 2022
  13. Shaoxuan YuanFeb 14, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.