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

Re: [PATCH v3 00/21] git-p4: Various code tidy-ups

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 17, 2022, 02:22 UTC
Message-ID
<xmqq4k63xfsj.fsf@gitster.g>
In-Reply-To
<20220116160550.514637-1-jholdsworth@nvidia.com>

Between CI runs https://github.com/git/git/actions/runs/1705530485 and https://github.com/git/git/actions/runs/1705883104 the only difference is that the former has this topic merged while the latter does not.

> Patches to correct these items may be provided later.
 cf. https://github.com/git/git/runs/4834693492?check_suite_focus=true#step:5:1586
 cf. https://github.com/git/git/runs/4834693517?check_suite_focus=true#step:5:1643
That is another thing to correct.
> This third version of the patch-set is rebased on top of the next
> branch.

By the way, to try it out, I pretended that you followed the advice in the SubmittingPatches document, namely:

    cf. Documentation/SubmittingPatches::[[base-branch]]
    * A new feature should be based on `master` in general. If the new
      feature depends on other topics that are in `next`, but not in
      `master`, fork a branch from the tip of `master`, merge these topics
      to the branch, and work on that branch.  You can remind yourself of
      how you prepared the base with `git log --first-parent master..`.
So, the patches are queued like so:
    $ git log --oneline --first-parent master..jh/p4-various-fixups
    818dd3982a git-p4: seperate multiple statements onto seperate lines
    0742a3fb0f git-p4: move inline comments to line above
    e34dcdaa6d git-p4: only seperate code blocks by a single empty line
    5d2c48612b git-p4: compare to singletons with "is" and "is not"
    cc2572b455 git-p4: normalize indentation of lines in conditionals
    3ae33c2d87 git-p4: ensure there is a single space around all operators
    6f4806cc58 git-p4: ensure every comment has a single #
    34f7c77da5 git-p4: remove spaces between dictionary keys and colons
    8c59479063 git-p4: remove redundant backslash-continuations inside brackets
    26c76f8db0 git-p4: remove extraneous spaces before function arguments
    eb7c7a9975 git-p4: place a single space after every comma
    d33eccbd7b git-p4: removed brackets when assigning multiple return values
    3465b01a94 git-p4: remove spaces around default arguments
    f806563768 git-p4: remove padding from lists, tuples and function arguments
    555e0c358a git-p4: sort and de-duplcate pylint disable list
    882a0dfd22 git-p4: remove commented code
    6483f061f7 git-p4: convert descriptive class and function comments into docstrings
    85c22c0c22 git-p4: improve consistency of docstring formatting
    bab9c087e7 git-p4: indent with 4-spaces
    fb8c71c28b git-p4: remove unneeded semicolons from statements
    b66e36e374 git-p4: add blank lines between functions and class definitions
    d8d4f440a5 Merge branch 'jh/p4-spawning-external-commands-cleanup' into jh/p4-...
    f3e99f0e9c Merge branch 'jh/p4-fix-use-of-process-error-exception' into jh/p4-...
which was created by
    $ git checkout -B jh/p4-various-fixups v2.35.0-rc1
    $ git merge --no-edit jh/p4-fix-use-of-process-error-exception
    $ git merge --no-edit jh/p4-spawning-external-commands-cleanup
    $ git am -s ./+jh21-v3-p4-various-fixups

where ./+jh21-v3-p4-various-fixups is the mbox file with these 21 patches, and jh/p4-* are the two topic branches form you that are still in 'next'. This way, you still have to wait for these two topics to graduage before this new series can go in, but you won't be taken hostage by other unrelated topics in 'next'.

It probably is a good idea to do the same when you prepare the next round of this series.

I've ejected this topic from 'seen', but the topic itself should still be there in https://github.com/gitster/git/ repository.

Thanks.
Previous: Junio C Hamano
Message 29 of 29 in “git-p4: Various code tidy-ups”
  1. 00/21 git-p4: Various code tidy-upsJoel Holdsworth, Jan 16, 2022
  2. 02/21 git-p4: remove unneeded semicolons from statementsJoel Holdsworth, Jan 16, 2022
  3. Junio C HamanoJan 17, 2022
  4. 01/21 git-p4: add blank lines between functions and class definitionsJoel Holdsworth, Jan 16, 2022
  5. 03/21 git-p4: indent with 4-spacesJoel Holdsworth, Jan 16, 2022
  6. 04/21 git-p4: improve consistency of docstring formattingJoel Holdsworth, Jan 16, 2022
  7. 05/21 git-p4: convert descriptive class and function comments into docstringsJoel Holdsworth, Jan 16, 2022
  8. 06/21 git-p4: remove commented codeJoel Holdsworth, Jan 16, 2022
  9. 07/21 git-p4: sort and de-duplcate pylint disable listJoel Holdsworth, Jan 16, 2022
  10. 08/21 git-p4: remove padding from lists, tuples and function argumentsJoel Holdsworth, Jan 16, 2022
  11. 09/21 git-p4: remove spaces around default argumentsJoel Holdsworth, Jan 16, 2022
  12. 10/21 git-p4: removed brackets when assigning multiple return valuesJoel Holdsworth, Jan 16, 2022
  13. 11/21 git-p4: place a single space after every commaJoel Holdsworth, Jan 16, 2022
  14. 12/21 git-p4: remove extraneous spaces before function argumentsJoel Holdsworth, Jan 16, 2022
  15. 13/21 git-p4: remove redundant backslash-continuations inside bracketsJoel Holdsworth, Jan 16, 2022
  16. 14/21 git-p4: remove spaces between dictionary keys and colonsJoel Holdsworth, Jan 16, 2022
  17. 15/21 git-p4: ensure every comment has a single #Joel Holdsworth, Jan 16, 2022
  18. 16/21 git-p4: ensure there is a single space around all operatorsJoel Holdsworth, Jan 16, 2022
  19. 17/21 git-p4: normalize indentation of lines in conditionalsJoel Holdsworth, Jan 16, 2022
  20. 18/21 git-p4: compare to singletons with "is" and "is not"Joel Holdsworth, Jan 16, 2022
  21. 20/21 git-p4: move inline comments to line aboveJoel Holdsworth, Jan 16, 2022
  22. 21/21 git-p4: seperate multiple statements onto seperate linesJoel Holdsworth, Jan 16, 2022
  23. 19/21 git-p4: only seperate code blocks by a single empty lineJoel Holdsworth, Jan 16, 2022
  24. Junio C HamanoJan 17, 2022
  25. Joel HoldsworthFeb 3, 2022
  26. Junio C HamanoFeb 3, 2022
  27. Joel HoldsworthFeb 4, 2022
  28. Junio C HamanoFeb 4, 2022
  29. Junio C HamanoJan 17, 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.