Skip to content

Documentation/git-merge-tree.adoc: clarify the --merge-base option #1980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

Documentation/git-merge-tree.adoc: clarify the --merge-base option #1980

wants to merge 1 commit into from

Conversation

@newren
Copy link

@newren newren commented Oct 2, 2025

No description provided.

@newren
Documentation/git-merge-tree.adoc: clarify the --merge-base option
b7f4d97 
The --merge-base option for merge-tree has a few slightly awkward
constructions or omissions:
  * Split the initial long sentence describing the option into two,
    making the instructions and the limitations clearer for readers.
  * Add context to the final sentence that might be obvious to some
    readers but isn't immediately obvious to all.
  * The discussion about lack of support for multiple merge bases
    simply leave folks wondering why that matters and could help or
    hurt.  Separate it out and add a brief explanation.

Signed-off-by: Elijah Newren <newren@gmail.com>
@dscho
Copy link
Member

dscho commented Oct 2, 2025

Ah, the usual Meson failures, and of course without any useful information (which probably was in D:\a\git\git\build\meson-logs\testlog.txt and has long ago gone 💥):

------------------------------------- 8< -------------------------------------
stderr:

(test program exited with status code 1)
------------------------------------------------------------------------------


Summary of Failures:

 95/102 t8020-last-modified                            ERROR          16.09s   exit status 1

Ok:                82  
Fail:              1   
Skipped:           19  

Full log written to D:\a\git\git\build\meson-logs\testlog.txt
Error: Process completed with exit code 1.

Back when the idea was still to use CMake as the next build system, we did not have such unhelpful CI failures.

Will re-run, 🤞that it will "magically succeed" now.

dscho
dscho approved these changes Oct 2, 2025
View reviewed changes
Copy link
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the original wording is on me. Sorry.

@newren
Copy link
Author

newren commented Oct 2, 2025

Back when the idea was still to use CMake as the next build system, we did not have such unhelpful CI failures.

Thanks for digging into this for me.

Will re-run, 🤞that it will "magically succeed" now.

Thanks, looks like it didn't work but since this is just a documentation change that couldn't cause those build failures, I think I'll just ignore it...

I guess the original wording is on me. Sorry.

From blame, 2 of the 3 commits that led to the current wording was from Kyle Zhao (and most of the text was from those 2 commits), leaving only 1 to you. Regardless of what blame says, though, I was the reviewer of all three commits on the mailing list, so it's much more on me than on you.

@newren
Copy link
Author

newren commented Oct 2, 2025

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 2, 2025

Submitted as pull.1980.git.1759444487406.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1980/newren/merge-tree-merge-base-clarifications-v1

To fetch this version to local tag pr-1980/newren/merge-tree-merge-base-clarifications-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1980/newren/merge-tree-merge-base-clarifications-v1

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 3, 2025

This patch series was integrated into seen via git@8d41f61.

@gitgitgadget gitgitgadget bot added the seen label Oct 3, 2025
@gitgitgadget
Copy link

gitgitgadget bot commented Oct 5, 2025

This branch is now known as en/doc-merge-tree-describe-merge-base.

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 5, 2025

This patch series was integrated into seen via git@eed6af7.

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 6, 2025

This patch series was integrated into seen via git@cdc1761.

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 6, 2025

This patch series was integrated into next via git@787ff6f.

@gitgitgadget gitgitgadget bot added the next label Oct 6, 2025
@gitgitgadget
Copy link

gitgitgadget bot commented Oct 6, 2025

There was a status update in the "New Topics" section about the branch en/doc-merge-tree-describe-merge-base on the Git mailing list:

Clarify the "--merge-base" command line option in "git merge-tree".

Will merge to 'master'.
source: <pull.1980.git.1759444487406.gitgitgadget@gmail.com>

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 7, 2025

This patch series was integrated into seen via git@bbc277f.

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 8, 2025

This patch series was integrated into seen via git@9061279.

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 9, 2025

There was a status update in the "Cooking" section about the branch en/doc-merge-tree-describe-merge-base on the Git mailing list:

Clarify the "--merge-base" command line option in "git merge-tree".

Will merge to 'master'.
source: <pull.1980.git.1759444487406.gitgitgadget@gmail.com>

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 10, 2025

This patch series was integrated into seen via git@d513a6f.

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 10, 2025

This patch series was integrated into seen via git@472c3f5.

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 10, 2025

This patch series was integrated into master via git@472c3f5.

@gitgitgadget
Copy link

gitgitgadget bot commented Oct 10, 2025

This patch series was integrated into next via git@472c3f5.

@gitgitgadget gitgitgadget bot added the master label Oct 10, 2025
@gitgitgadget gitgitgadget bot closed this Oct 10, 2025
@gitgitgadget
Copy link

gitgitgadget bot commented Oct 10, 2025

Closed via 472c3f5.

webstech pushed a commit that referenced this pull request Nov 5, 2025
@dscho
Merge pull request #1980 from gitgitgadget/prepare-config-handling
30956fe 
Prepare config handling for the upcoming GitHub Action
webstech pushed a commit that referenced this pull request Nov 5, 2025
@dscho
Merge pull request #1982 from gitgitgadget/add-the-action
fb43b1c 
This PR is part 3 of addressing #609, and it is stacked on top of #1980 and #1981 (and therefore contains also the commits of those PRs), therefore I will leave this in draft mode until those PRs are merged.

The grand idea is to bundle the `CIHelper` class together with all its direct and transitive dependencies into one big, honking `dist/index.js`, and then add a set of really minimal GitHub Actions that call into `CIHelper`. The Actions are added in sub-directories so that they can be called in GitHub workflows via e.g. `- uses: gitgitgadget/gitgitgadget/update-prs@1`.

The component used for bundling `CIHelper` is [`@vercel/ncc` ](https://www.npmjs.com/package/@vercel/ncc). To support acting as a GitHub Action, [`@actions/core`](https://www.npmjs.com/package/@actions/core) is installed.

To allow for really minimal GitHub Actions, the `CIHelper` class is augmented accordingly to re-implement more logic that is currently either in `misc-helper.ts` or in the (non-public 😞) Azure Pipelines definitions.

The naming convention for specifying the necessary tokens as GitHub Actions inputs is:
- `upstream-repo-token`: This is to comment on PRs in `git/git`
- `pr-repo-token`: This is to comment on PRs in `gitgitgadget/git` (as well as to be able to push to that repository)
- `test-repo-token`: This is to comment on PRs in `dscho/git` (used exclusively for testing)

To clarify, here is a diagram:

```mermaid
graph TD
    user["user (contributor)"]
    upstream-repo["upstream-repo (authoritative project repo)"]
    pr-repo["pr-repo (GitGitGadget-enabled GitHub repo)"]
    GitGitGadget["GitGitGadget"]
    mailing-list["mailing-list"]

    user -->|"opens PR"| pr-repo
    user -->|"opens PR (if GitHub App installed)"| upstream-repo

    upstream-repo -->|"GitGitGadget syncs branches to"| pr-repo

    pr-repo -->|"slash commands"| GitGitGadget
    upstream-repo -->|"slash commands (if App installed)"| GitGitGadget

    GitGitGadget -->|"sends patch series"| mailing-list
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dscho dscho dscho approved these changes

Assignees

No one assigned

Labels

master next seen

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@newren @dscho