mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-04 13:36:14 +02:00
Code

Makefile & .gitignore: ignore & clean "git.res", not "*.res" 

Adjust the overly broad .gitignore and "make clean" rule added in
ce39c2e04c (Provide a Windows version resource for the git
executables., 2012-05-24).

For now this is merely a correctness fix, but needed because a
subsequent commit will want to check in *.res files elsewhere in the
tree, which we shouldn't have to "git add -f".

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-07-05 15:46:56 +02:00 committed by Junio C Hamano
parent 7b63ea5750
commit af0aa6904b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -185,6 +185,7 @@
/git-worktree
/git-write-tree
/git-core-*/?*
/git.res
/gitweb/GITWEB-BUILD-OPTIONS
/gitweb/gitweb.cgi
/gitweb/static/gitweb.js
@ -225,7 +226,6 @@
*.hcc
*.obj
*.lib
*.res
*.sln
*.sp
*.suo

2
Makefile
View File

@ -3409,7 +3409,7 @@ cocciclean:
clean: profile-clean coverage-clean cocciclean
$(RM) -r .build
$(RM) po/git.pot po/git-core.pot
$(RM) *.res
$(RM) git.res
$(RM) $(OBJECTS)
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X