Skip to content

Commit 5377abc

Browse files
avargitster
authored andcommitted
po/git.pot: don't check in result of "make pot"
Remove the "po/git.pot" file from being tracked, which started with dce37b6 (l10n: initial git.pot for 1.7.10 upcoming release, 2012-02-13). The reason the po/git.pot started being checked in was because the po/*.po files were changed a schema where we'd generate them from a known-good snapshot of po/git.pot, instead of each translator running "make pot" themselves. This makes sense, but we don't need to carry this file in-tree just to achieve that aim, and doing so has resulted in a significant amount of "diff churn" since this method of doing it was introduced: $ git log -p --oneline -- po/git.pot|wc -l 553743 We can instead let l10n contributors to generate "po/git.pot" in runtime to update their own "po/XX.po", and the l10n coordinator can check pull requests using CI pipeline. This reverts to the schema introduced initially in cd5513a (i18n: Makefile: "pot" target to extract messages marked for translation, 2011-02-22). The actual "git rm" of po/git.pot was in preceding commit to make this change easier to review, and to preempt the mailing list from blocking it due to it being too large. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Jiang Xin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e448263 commit 5377abc

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2786,8 +2786,8 @@ endef
27862786
$(call mkdir_p_parent_template)
27872787
$(QUIET_GEN)$(gen_pot_header)
27882788

2789-
po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO) FORCE
2790-
$(QUIET_GEN)$(MSGCAT) $(filter-out FORCE,$^) >$@
2789+
po/git.pot: .build/pot/git.header $(LOCALIZED_ALL_GEN_PO)
2790+
$(QUIET_GEN)$(MSGCAT) $^ >$@
27912791

27922792
.PHONY: pot
27932793
pot: po/git.pot
@@ -3330,6 +3330,7 @@ cocciclean:
33303330

33313331
clean: profile-clean coverage-clean cocciclean
33323332
$(RM) -r .build
3333+
$(RM) po/git.pot
33333334
$(RM) *.res
33343335
$(RM) $(OBJECTS)
33353336
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)

po/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/build
2+
/git.pot

0 commit comments

Comments
 (0)