threads / patch / 51805

patchFix stale .gitignore change, introduced via js/visual-studio

Subject: [PATCH 0/1] Fix stale .gitignore change, introduced via js/visual-studio

## tl;dr

3 messages between Sep 5, 2019 and Sep 5, 2019. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Johannes Schindelin via GitGitGadget· Sep 5, 2019, 11:16 UTC · lore

As reported in https://public-inbox.org/git/20190825120741.GM20404@szeder.dev/, 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.
Johannes Schindelin (1):
  .gitignore: stop ignoring `.manifest` files
 .gitignore | 1 -
 1 file changed, 1 deletion(-)
base-commit: 745f6812895b31c02b29bdfe4ae8e5498f776c26
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-332%2Fdscho%2Fstop-ignoring-manifest-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-332/dscho/stop-ignoring-manifest-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/332
-- 
gitgitgadget
Johannes Schindelin via GitGitGadget· Sep 5, 2019, 11:16 UTC · re: Johannes Schindelin via GitGitGadget · lore

[PATCH 1/1] .gitignore: stop ignoring `.manifest` files

From: Johannes Schindelin <johannes.schindelin@gmx.de>

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 <johannes.schindelin@gmx.de>
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)
Show changes to .gitignore +0 −1
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
Junio C Hamano· Sep 5, 2019, 17:44 UTC · re: Johannes Schindelin via GitGitGadget · lore

Re: [PATCH 1/1] .gitignore: stop ignoring `.manifest` files

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 8 quoted lines
> ...
> 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 <johannes.schindelin@gmx.de>
> ---
>  .gitignore | 1 -
>  1 file changed, 1 deletion(-)
Thanks.
Show 12 quoted lines
> 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

← back to recent threads