Skip to content

A couple of fixups for add-i-in-c-status-and-help #2191

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

Merged
merged 2 commits into from
May 13, 2019

Conversation

dscho
Copy link
Member

@dscho dscho commented May 13, 2019

Before integrating the built-in add -p into Git for Windows' master, I had actually forgotten about @jeffhostetler's very helpful suggestions. Better late than never ;-)

dscho added 2 commits May 13, 2019 14:56
Clarify the role of the "magic" `-1` and `-2` return values of the
`list_and_choose()` function.

Signed-off-by: Johannes Schindelin <[email protected]>
Let's not walk off the end of the array. Also, avoid an early `malloc()`
in `add_prefix_entry()` (avoiding reuse of the same data structure for
lookup as for adding a new item), and strengthen the condition for the
bug condition.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho added this to the v2.21.0(2) milestone May 13, 2019
@dscho dscho requested a review from jeffhostetler May 13, 2019 13:05
@jeffhostetler
Copy link

WRT add-interactive.c, I think this helps greatly. Thanks!

@jeffhostetler
Copy link

WRT prefix-map.c, I studied it as best I could on my iPad. I think I need to wait until I get back to my computer to look at it in more detail. But don’t let this block you.

@dscho
Copy link
Member Author

dscho commented May 13, 2019

Thank you for your review!

@dscho dscho merged commit d4e5e1e into git-for-windows:master May 13, 2019
@dscho dscho deleted the add-p-fixups branch May 13, 2019 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants