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

Add the REBASE_P prerequisite to two more test cases #296

Closed
wants to merge 6 commits into from

Commits on May 15, 2019

  1. Drop unused git-rebase--am.sh

    Since 2185362 (built-in rebase: call `git am` directly, 2019-01-18),
    the built-in rebase already uses the built-in `git am` directly.
    
    Now that d03ebd4 (rebase: remove the rebase.useBuiltin setting,
    2019-03-18) even removed the scripted rebase, there is no longer any
    user of `git-rebase--am.sh`, so let's just remove it.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho authored and gitster committed May 15, 2019
    Configuration menu
    Copy the full SHA
    311c00a View commit details
    Browse the repository at this point in the history
  2. t3400: stop referring to the scripted rebase

    One test case's title mentioned the then-current implementation detail
    that the `--am` backend was implemented in `git-rebase--am.sh`.
    
    This is no longer the case, so let's update the title to reflect the
    current reality.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho authored and gitster committed May 15, 2019
    Configuration menu
    Copy the full SHA
    b2b9a23 View commit details
    Browse the repository at this point in the history
  3. .gitignore: there is no longer a built-in git-rebase--interactive

    This went away in 0609b74 (rebase -i: combine rebase--interactive.c
    with rebase.c, 2019-04-17).
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho authored and gitster committed May 15, 2019
    Configuration menu
    Copy the full SHA
    d4fe60e View commit details
    Browse the repository at this point in the history
  4. sequencer: the am and rebase--interactive scripts are gone

    Update a code comment that referred to those files as if they were still
    there.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho authored and gitster committed May 15, 2019
    Configuration menu
    Copy the full SHA
    c3c003e View commit details
    Browse the repository at this point in the history
  5. rebase: fold git-rebase--common into the -p backend

    The only remaining scripted part of `git rebase` is the
    `--preserve-merges` backend. Meaning: there is little reason to keep the
    "library of common rebase functions" as a separate file.
    
    While moving the functions to `git-rebase--preserve-merges.sh`, we also
    drop the `move_to_original_branch` function that is no longer used.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho authored and gitster committed May 15, 2019
    Configuration menu
    Copy the full SHA
    082ef75 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

  1. t3422: mark two test cases as requiring support for --preserve-merges

    We started marking all of those test cases that require `git rebase -p`
    to work in the recent past, to allow for skipping them (because the
    `--preserve-merges` backend is already deprecated and will be removed in
    one of the next major versions, so it is a bit pointless to test its
    functionality all the time).
    
    This patch marks two previously forgotten test cases with the `REBASE_P`
    prerequisite, to allow skipping them via setting the environment
    variable `GIT_TEST_SKIP_REBASE_P`.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    ed41e8d View commit details
    Browse the repository at this point in the history