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.

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

Clean up after the removal of the scripted rebase #194

Closed
wants to merge 5 commits into from
Closed

Clean up after the removal of the scripted rebase #194

wants to merge 5 commits into from

Conversation

dscho
Copy link
Member

@dscho dscho commented May 14, 2019

Technically, there is still one part that is scripted: git rebase --preserve-merges. But that is already deprecated, and the remaining parts really are no longer scripted.

Meaning that we do not need git-rebase--am.sh.

While at it, clean up a few other places that reference the scripted rebase, and also move the functions from git-rebase--common.sh directly into the -p backend (because it is the sole remaining user).

dscho added 5 commits May 14, 2019 11:34
@dscho
Drop unused git-rebase--am.sh
fa2b967 
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>
@dscho
t3400: stop referring to the scripted rebase
b9d1fd1 
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>
@dscho
.gitignore: there is no longer a built-in git-rebase--interactive
ab1fc1a 
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>
@dscho
sequencer: the am and rebase--interactive scripts are gone
158ddcc 
Update a code comment that referred to those files as if they were still
there.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
rebase: fold git-rebase--common into the -p backend
70af172 
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>
@dscho
Copy link
Member Author

dscho commented May 14, 2019

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented May 14, 2019

Submitted as pull.194.git.gitgitgadget@gmail.com

@gitgitgadget
Copy link

gitgitgadget bot commented May 15, 2019

This branch is now known as js/rebase-cleanup.

@gitgitgadget
Copy link

gitgitgadget bot commented May 15, 2019

This patch series was integrated into pu via git@2cdf912.

@gitgitgadget gitgitgadget bot added the pu label May 15, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented May 16, 2019

This patch series was integrated into pu via git@6374082.

@gitgitgadget
Copy link

gitgitgadget bot commented May 16, 2019

This patch series was integrated into next via git@ccfed8f.

@gitgitgadget gitgitgadget bot added the next label May 16, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented May 19, 2019

This patch series was integrated into pu via git@d3e7d32.

@weekly-digest weekly-digest bot mentioned this pull request May 19, 2019
Closed
@weekly-digest weekly-digest bot mentioned this pull request May 26, 2019
Closed
@gitgitgadget
Copy link

gitgitgadget bot commented May 29, 2019

This patch series was integrated into pu via git@8fb0cb2.

@gitgitgadget
Copy link

gitgitgadget bot commented May 30, 2019

This patch series was integrated into pu via git@5ab7047.

@gitgitgadget
Copy link

gitgitgadget bot commented May 30, 2019

This patch series was integrated into pu via git@15ce93f.

@weekly-digest weekly-digest bot mentioned this pull request Jun 2, 2019
Closed
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 3, 2019

This patch series was integrated into pu via git@9fcf3ca.

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 6, 2019

This patch series was integrated into pu via git@bf14375.

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 7, 2019

This patch series was integrated into pu via git@e84991b.

@weekly-digest weekly-digest bot mentioned this pull request Jun 9, 2019
Closed
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 10, 2019

This patch series was integrated into pu via git@c8fba2e.

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 12, 2019

This patch series was integrated into pu via git@79d4b93.

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 13, 2019

This patch series was integrated into pu via git@ed7f8ac.

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 13, 2019

This patch series was integrated into next via git@ed7f8ac.

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 13, 2019

This patch series was integrated into master via git@ed7f8ac.

@gitgitgadget gitgitgadget bot added the master label Jun 13, 2019
@gitgitgadget gitgitgadget bot closed this Jun 13, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 13, 2019

Closed via ed7f8ac.

@dscho dscho deleted the drop-rebase--am.sh branch June 18, 2019 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
master next pu
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@dscho