Makefile & .gitignore: ignore & clean "git.res", not "*.res"
Adjust the overly broad .gitignore and "make clean" rule added in ce39c2e04ce (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>
Ævar Arnfjörð Bjarmason committed
Jul 5, 2022 at 15:46 UTC
af0aa6904b700e72491ff381d89c163e80753da3
2 files changed
+2
-2
.gitignore
+1
-1
@@ -185,6 +185,7 @@
185
/git-worktree
186
/git-write-tree
187
/git-core-*/?*
188
+/git.res
189
/gitweb/GITWEB-BUILD-OPTIONS
190
/gitweb/gitweb.cgi
191
/gitweb/static/gitweb.js
@@ -225,7 +226,6 @@
226
*.hcc
227
*.obj
228
*.lib
228
-*.res
229
*.sln
230
*.sp
231
*.suo
Makefile
+1
-1
@@ -3409,7 +3409,7 @@ cocciclean:
3409
clean: profile-clean coverage-clean cocciclean
3410
$(RM) -r .build
3411
$(RM) po/git.pot po/git-core.pot
3412
- $(RM) *.res
3412
+ $(RM) git.res
3413
$(RM) $(OBJECTS)
3414
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)
3415
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X