Skip to content

Fix stale .gitignore change, introduced via js/visual-studio #332

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

Closed
wants to merge 1 commit into from

Conversation

dscho
Copy link
Member

@dscho dscho commented Sep 5, 2019

As reported in https://public-inbox.org/git/[email protected]/, we added a line to ignore .manifest files, but that is a left-over from a long time ago, before we added and used compat/win32/git.manifest.

This fixes that left-over.

On Windows, it is possible to embed additional metadata into an
executable by linking in a "manifest", i.e. an XML document that
describes capabilities and requirements (such as minimum or maximum
Windows version). These XML documents are expected to be stored in
`.manifest` files.

At least _some_ Visual Studio versions auto-generate `.manifest` files
when none is specified explicitly, therefore we used to ask Git to
ignore them.

However, we do have a beautiful `.manifest` file now:
`compat/win32/git.manifest`, so neither does Visual Studio auto-generate
a manifest for us, nor do we want Git to ignore the `.manifest` files
anymore.

Further reading on auto-generated `.manifest` files:
https://docs.microsoft.com/en-us/cpp/build/manifest-generation-in-visual-studio

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
Copy link
Member Author

dscho commented Sep 5, 2019

/submit

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 5, 2019

Submitted as [email protected]

@camsteffen
Copy link

Can you give me permission to submit over at #330?

@@ -231,7 +231,6 @@
*.ipdb
Copy link

Choose a reason for hiding this comment

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

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Johannes Schindelin via GitGitGadget" <[email protected]>
writes:

> ...
> Further reading on auto-generated `.manifest` files:
> https://docs.microsoft.com/en-us/cpp/build/manifest-generation-in-visual-studio
>
> Signed-off-by: Johannes Schindelin <[email protected]>
> ---
>  .gitignore | 1 -
>  1 file changed, 1 deletion(-)

Thanks.

> diff --git a/.gitignore b/.gitignore
> index 521d8f4fb4..fc445edea9 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -231,7 +231,6 @@
>  *.ipdb
>  *.dll
>  .vs/
> -*.manifest
>  Debug/
>  Release/
>  /UpgradeLog*.htm

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 5, 2019

This branch is now known as js/visual-studio.

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 5, 2019

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

@gitgitgadget gitgitgadget bot added the pu label Sep 5, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Sep 7, 2019

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

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 9, 2019

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

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 9, 2019

This patch series was integrated into next via git@5493ee9.

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 16, 2019

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

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 17, 2019

This patch series was integrated into pu via git@40d2ce4.

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 18, 2019

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

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 18, 2019

This patch series was integrated into pu via git@9921c3c.

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 30, 2019

This patch series was integrated into pu via git@59438be.

@gitgitgadget
Copy link

gitgitgadget bot commented Sep 30, 2019

This patch series was integrated into master via git@59438be.

@gitgitgadget gitgitgadget bot added the master label Sep 30, 2019
@gitgitgadget gitgitgadget bot closed this Sep 30, 2019
@gitgitgadget
Copy link

gitgitgadget bot commented Sep 30, 2019

Closed via 59438be.

@dscho dscho deleted the stop-ignoring-manifest branch September 30, 2019 09:44
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.

2 participants