KEMBAR78
Comparing 726f89c2dd...1c320135e1 · git/git · GitHub
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: git/git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 726f89c2dd
Choose a base ref
...
head repository: git/git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1c320135e1
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 26, 2018

  1. t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks 

    We are going to allow 'git cherry-pick -m 1' for non-merge commits, so
this method to force failure will stop to work.

Use '-m 4' instead as it's very unlikely we will ever have such an
octopus in this test setup.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @sorganov @gitster
    sorganov authored and gitster committed Dec 26, 2018
    Configuration menu
    Copy the full SHA
    c812bd4 View commit details
    Browse the repository at this point in the history

  2. cherry-pick: do not error on non-merge commits when '-m 1' is specified 

    When cherry-picking multiple commits, it's impossible to have both
merge- and non-merge commits on the same command-line. Not specifying
'-m 1' results in cherry-pick refusing to handle merge commits, while
specifying '-m 1' fails on non-merge commits.

This patch allows '-m 1' for non-merge commits. As mainline is always
the only parent for a non-merge commit, it makes little sense to
disable it.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @sorganov @gitster
    sorganov authored and gitster committed Dec 26, 2018
    Configuration menu
    Copy the full SHA
    37897bf View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2019

  1. t3502: validate '-m 1' argument is now accepted for non-merge commits 

    Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @sorganov @gitster
    sorganov authored and gitster committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    4d67b4e View commit details
    Browse the repository at this point in the history

  2. t3506: validate '-m 1 -ff' is now accepted for non-merge commits 

    Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @sorganov @gitster
    sorganov authored and gitster committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    1c32013 View commit details
    Browse the repository at this point in the history
Loading