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

stash/reset/checkout -p: optionally use the add --patch backend written in pure C #174

Closed
wants to merge 7 commits into from

Conversation

dscho
Copy link
Member

@dscho dscho commented Mar 28, 2019

At this stage on the journey to a fully built-in git add, we already have everything we need, including the --interactive and --patch options, as long as the add.interactive.useBuiltin setting is set to true. This config setting is kind of a feature flag that is currently turned off by default, and will be for a while, until we get confident enough that the built-in version does the job, and retire the Perl script.

However, the internal add--interactive helper is also used to back the --patch option of git stash, git reset, git checkout and git worktree.

This patch series (based on js/add-p-in-c) brings them "online".

Changes since v1:

  • Renamed patch_mode_stage to patch_mode_add (and ADD_P_STAGE to ADD_P_ADD).
  • Renamed the fields diff, apply and apply_check (that were inherited from the Perl script) to diff_cmd, apply_args and apply_check_args, respectively.
  • Clarified the magic array size 4 of diff_cmd and friends.
  • Introduced pseudo value PROMPT_MODE_MAX to make the array size of prompt_mode more obvious.
  • Got rid of the unneeded = 0 initializers for is_reverse.

@dscho dscho force-pushed the other-command-p-in-c branch 6 times, most recently from 7416510 to 1a764b5 Compare April 3, 2019 20:28
@dscho dscho changed the base branch from master to js/builtin-add-i November 14, 2019 12:47
@dscho dscho force-pushed the other-command-p-in-c branch 4 times, most recently from 074bb1c to d7ab0a3 Compare November 25, 2019 18:27
@dscho dscho changed the base branch from js/builtin-add-i to js/builtin-add-i-cmds November 25, 2019 18:57
@dscho dscho force-pushed the other-command-p-in-c branch 3 times, most recently from b5e30be to cb934d3 Compare December 7, 2019 15:29
@dscho dscho changed the base branch from js/builtin-add-i-cmds to js/add-p-in-c December 14, 2019 18:19
@dscho
Copy link
Member Author

dscho commented Dec 17, 2019

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Dec 17, 2019

@gitgitgadget
Copy link

gitgitgadget bot commented Dec 30, 2019

This patch series was integrated into pu via git@96a9bb8.

@gitgitgadget
Copy link

gitgitgadget bot commented Dec 30, 2019

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

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 2, 2020

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

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 3, 2020

This patch series was integrated into pu via git@7b1a26c.

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 5, 2020

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

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 6, 2020

This patch series was integrated into pu via git@01d074e.

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 7, 2020

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

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 8, 2020

This patch series was integrated into pu via git@74090b1.

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 9, 2020

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

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 9, 2020

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

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 10, 2020

This patch series was integrated into pu via git@1be1585.

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 13, 2020

This patch series was integrated into pu via git@12c1bc5.

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 13, 2020

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

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 15, 2020

This patch series was integrated into pu via git@92323a0.

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 17, 2020

This patch series was integrated into pu via git@76bc47e.

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 24, 2020

This patch series was integrated into pu via git@4bff803.

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 27, 2020

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

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 27, 2020

This patch series was integrated into next via git@36f6756.

@gitgitgadget
Copy link

gitgitgadget bot commented Jan 30, 2020

This patch series was integrated into pu via git@3a45b3c.

@gitgitgadget
Copy link

gitgitgadget bot commented Feb 5, 2020

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

@gitgitgadget
Copy link

gitgitgadget bot commented Feb 5, 2020

This patch series was integrated into next via git@9a5315e.

@gitgitgadget
Copy link

gitgitgadget bot commented Feb 5, 2020

This patch series was integrated into master via git@9a5315e.

@gitgitgadget gitgitgadget bot added the master label Feb 5, 2020
@gitgitgadget gitgitgadget bot closed this Feb 5, 2020
@gitgitgadget
Copy link

gitgitgadget bot commented Feb 5, 2020

Closed via 9a5315e.

@dscho dscho deleted the other-command-p-in-c branch February 5, 2020 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant