* [PATCH 0/1] Fix stale .gitignore change, introduced via js/visual-studio
@ 2019-09-05 11:16 Johannes Schindelin via GitGitGadget
2019-09-05 11:16 ` [PATCH 1/1] .gitignore: stop ignoring `.manifest` files Johannes Schindelin via GitGitGadget
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-09-05 11:16 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] .gitignore: stop ignoring `.manifest` files
2019-09-05 11:16 [PATCH 0/1] Fix stale .gitignore change, introduced via js/visual-studio Johannes Schindelin via GitGitGadget
@ 2019-09-05 11:16 ` Johannes Schindelin via GitGitGadget
2019-09-05 17:44 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-09-05 11:16 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Johannes Schindelin
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] .gitignore: stop ignoring `.manifest` files
2019-09-05 11:16 ` [PATCH 1/1] .gitignore: stop ignoring `.manifest` files Johannes Schindelin via GitGitGadget
@ 2019-09-05 17:44 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2019-09-05 17:44 UTC (permalink / raw)
To: Johannes Schindelin via GitGitGadget; +Cc: git, Johannes Schindelin
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
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 <johannes.schindelin@gmx.de>
> ---
> .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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-05 17:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-05 11:16 [PATCH 0/1] Fix stale .gitignore change, introduced via js/visual-studio Johannes Schindelin via GitGitGadget
2019-09-05 11:16 ` [PATCH 1/1] .gitignore: stop ignoring `.manifest` files Johannes Schindelin via GitGitGadget
2019-09-05 17:44 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).