Skip to content

convert.c: replace "\e" escapes with "\033".#1786

Closed
jamill wants to merge 9 commits into
git-for-windows:masterfrom
jamill:msvc_warning_fix
Closed

convert.c: replace "\e" escapes with "\033".#1786
jamill wants to merge 9 commits into
git-for-windows:masterfrom
jamill:msvc_warning_fix

Conversation

@jamill
Copy link
Copy Markdown

@jamill jamill commented Aug 8, 2018

The "\e" escape is not defined in ISO C.

While on this line, add a missing space after the comma.

Signed-off-by: Beat Bolli dev+git@drbeat.li
Signed-off-by: Junio C Hamano gitster@pobox.com

bbolli and others added 8 commits July 9, 2018 14:35
Include protocol.h to define enum protocol_version.

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Include iterator.h to define enum iterator_selection.

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The "\e" escape is not defined in ISO C.

While on this line, add a missing space after the comma.

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The macro GIT_PATH_FUNC expands to a function definition that ends with
a closing brace. Remove two extra semicolons.

While at it, fix the example in path.h.

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
ISO C forbids the conversion of void pointers to function pointers.
Introduce a context struct that encapsulates the function pointer.

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In ISO C, char constants must be in the range -128..127. Change the BOM
constants to char literals to avoid overflow.

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Copy link
Copy Markdown

@jeffhostetler jeffhostetler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’ve already merged this into Microsoft/git.git. I didn’t thnik to do it here too. Thanks!

@dscho
Copy link
Copy Markdown
Member

dscho commented Aug 9, 2018

How about merging bb/pedantic directly?

That would make things more obvious, and also make the next rebase straight-forward...

Copy link
Copy Markdown
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to merge bb/pedantic directly, instead of cherry-picking manually (and risking merge conflicts during the next rebase).

@jamill jamill force-pushed the msvc_warning_fix branch from 4137f82 to c213af4 Compare August 9, 2018 13:31
@jamill
Copy link
Copy Markdown
Author

jamill commented Aug 9, 2018

#1788 is a direct merge of the bb/pedantic, as I don't think I can switch the source branch. If that is the preferred route, we can close this PR.

@jamill
Copy link
Copy Markdown
Author

jamill commented Aug 9, 2018

Superseded by #1788

@jamill jamill closed this Aug 9, 2018
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.

5 participants