Skip to content
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.

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

git-rebase.txt: fix typo #740

Closed
wants to merge 1 commit into from
Closed

Conversation

phil-blain
Copy link
Contributor

@phil-blain phil-blain commented Mar 27, 2020

CC: Junio C Hamano gitster@pobox.com, Elijah Newren newren@gmail.com

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
@phil-blain
Copy link
Contributor Author

/submit

@gitgitgadget-git
Copy link

Error: Ignoring PR with empty title and/or body

@phil-blain
Copy link
Contributor Author

phil-blain commented Mar 27, 2020

@dscho Is gitgitgadget the same version on gitgitgadget/git and here ? I thought one-patch contribution did not need a cover letter anymore ?

@phil-blain
Copy link
Contributor Author

Also, for such contributions (ex. only Documentation/ is changed) would it be possible for the CI scripts to only run the Documentation build ? or would that be too complicated and we have enough CI ressources to not bother ?

@dscho
Copy link
Member

dscho commented Mar 28, 2020

Is gitgitgadget the same version on gitgitgadget/git and here ?

Should be. Let me verify (re-running the job).

@gitgitgadget-git
Copy link

Error: Ignoring PR with empty title and/or body

@dscho
Copy link
Member

dscho commented Mar 28, 2020

Yep, claims to be up to date: gitgitgadget/gitgitgadget@91e1028 is the latest commit on master.

Meaning that the Error should not be an error, at least not for single-patch contributions.

dscho added a commit to dscho/gitgitgadget that referenced this pull request Mar 28, 2020
Back when we _always_ sent a cover letter, it made sense to ask for a
non-empty description. However, since we started "folding in the cover
letter" for single-patch contributions, that restriction wants to be
loosened: no need for a description if we're only sending one mail to
begin with.

Example: git/git#740

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member

dscho commented Mar 28, 2020

Also, for such contributions (ex. only Documentation/ is changed) would it be possible for the CI scripts to only run the Documentation build?

I am not aware of any way to do this, unless we jump through several hoops: we would have to start the Pipeline by one job that determines what needs to be tested, and then we would have to make all other jobs dependent, and skip them if they should not be included.

At some stage, Azure Pipelines might support some sort of Test Impact Analysis (and then we would still need quite a bit of support from core Git's side to use that), but for the time being, they don't.

@phil-blain
Copy link
Contributor Author

/submit

@gitgitgadget-git
Copy link

@phil-blain
Copy link
Contributor Author

@dscho I tried to just add CC's but they didn't get parsed properly

@gitgitgadget-git
Copy link

On the Git mailing list, Elijah Newren wrote (reply to this):

On Sat, Mar 28, 2020 at 12:44 PM Philippe Blain via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> From: Philippe Blain <levraiphilippeblain@gmail.com>
>
> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
> ---
>     git-rebase.txt: fix typo
>
>     CC: Junio C Hamano gitster@pobox.com [gitster@pobox.com], Elijah Newren
>     newren@gmail.com [newren@gmail.com]
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-740%2Fphil-blain%2Fdoc-rebase-typo-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-740/phil-blain/doc-rebase-typo-v1
> Pull-Request: https://github.com/git/git/pull/740
>
>  Documentation/git-rebase.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index f7a6033607f..46ddf172d9c 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -605,7 +605,7 @@ BEHAVIORAL DIFFERENCES
>  -----------------------
>
>  git rebase has two primary backends: apply and merge.  (The apply
> -backend used to known as the 'am' backend, but the name led to
> +backend used to be known as the 'am' backend, but the name led to
>  confusion as it looks like a verb instead of a noun.  Also, the merge
>  backend used to be known as the interactive backend, but it is now
>  used for non-interactive cases as well.  Both were renamed based on
>
> base-commit: 3bab5d56259722843359702bc27111475437ad2a

Thanks for catching my missing 'be'.

@webstech
Copy link
Contributor

I tried to just add CC's but they didn't get parsed properly

There may be an expectation of an empty line preceding the cc (ie it is a footer).

@gitgitgadget-git
Copy link

This branch is now known as pb/rebase-doc-typofix.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via 96690f5.

@gitgitgadget-git gitgitgadget-git bot added the pu label Mar 29, 2020
@gitgitgadget-git
Copy link

This patch series was integrated into pu via 628be09.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via 7d4811a.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via 9c4a567.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via 9754bfe.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via 19eb164.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via 0b89de9.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via a2384e1.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via 6efa2a2.

@gitgitgadget-git
Copy link

This patch series was integrated into next via 8cd8422.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via d4fb4a1.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via 45271f4.

@gitgitgadget-git
Copy link

This patch series was integrated into pu via d0eb895.

@gitgitgadget-git
Copy link

This patch series was integrated into next via d0eb895.

@gitgitgadget-git
Copy link

This patch series was integrated into master via d0eb895.

@gitgitgadget-git
Copy link

Closed via d0eb895.

@phil-blain phil-blain deleted the doc-rebase-typo branch August 17, 2021 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants