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

[PATCH v2 0/3] advertise --skip for cherry-pick and revert better

From
Denton Liu <liu.denton@gmail.com>
Date
Aug 27, 2019, 04:45 UTC
Message-ID
<cover.1566880835.git.liu.denton@gmail.com>
In-Reply-To
<cover.1566637431.git.liu.denton@gmail.com>

Hi Junio, thanks for the suggestion. I incorporated your suggestion. Also, I decided to incorporate another patch (3/3) I was planning on submitting later since both these patchsets have a common purpose: advertising the `--skip` option better.

Before, the completion script would not complete `--skip` for cherry-pick and revert, even though it is a valid option while that operation is in progress. Add that missing completion.

Also, if a cherry-pick or revert is still in progress, mention the `--skip` flag in the status message so that users are more aware of their options.

Changes since v1:
* Instead of outright replacing the old completion variables, make them derive
  from a common variable.
* Add patch 3/3 and change the focus of this patchset so that it's focused on
  advertising the `--skip` option better.
Denton Liu (3):
  completion: merge options for cherry-pick and revert
  completion: add --skip for cherry-pick and revert
  status: mention --skip for revert and cherry-pick
 contrib/completion/git-completion.bash | 6 ++++--
 t/t7512-status-help.sh                 | 6 ++++++
 wt-status.c                            | 4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

Range-diff against v1: 1: cdcac97554 < -: ---------- completion: merge options for cherry-pick and revert 2: 75adf58158 < -: ---------- completion: add --skip for cherry-pick and revert -: ---------- > 1: 862802366a completion: merge options for cherry-pick and revert -: ---------- > 2: c83feb3d6e completion: add --skip for cherry-pick and revert -: ---------- > 3: be64ce1e92 status: mention --skip for revert and cherry-pick

-- 
2.23.0.248.g3a9dd8fb08
Previous: Junio C HamanoNext: Denton Liu
Message 5 of 12 in “completion: complete --skip for cherry-pick and revert”
  1. 0/2 completion: complete --skip for cherry-pick and revertDenton Liu, Aug 24, 2019
  2. 2/2 completion: add --skip for cherry-pick and revertDenton Liu, Aug 24, 2019
  3. 1/2 completion: merge options for cherry-pick and revertDenton Liu, Aug 24, 2019
  4. Junio C HamanoAug 26, 2019
  5. 0/3 advertise --skip for cherry-pick and revert betterDenton Liu, Aug 27, 2019
  6. 1/3 completion: merge options for cherry-pick and revertDenton Liu, Aug 27, 2019
  7. 2/3 completion: add --skip for cherry-pick and revertDenton Liu, Aug 27, 2019
  8. 3/3 status: mention --skip for revert and cherry-pickDenton Liu, Aug 27, 2019
  9. Junio C HamanoAug 27, 2019
  10. Denton LiuAug 27, 2019
  11. Junio C HamanoAug 28, 2019
  12. Denton LiuAug 28, 2019

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.