From: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx> Before feeding xgettext with more C souce files which may be ignored by various compiler conditions, add new option "--sort-by-file" to xgettext program to create stable message template file "po/git.pot". With this update, the newly generated "po/git.pot" will has the same entries while in a different order. We won't checkin the newly generated "po/git.pot", because we will remove it from tree in a later commit. Signed-off-by: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f8bccfab5e..83e968e2a4 100644 --- a/Makefile +++ b/Makefile @@ -2706,6 +2706,7 @@ XGETTEXT_FLAGS = \ --force-po \ --add-comments=TRANSLATORS: \ --msgid-bugs-address="Git Mailing List <git@xxxxxxxxxxxxxxx>" \ + --sort-by-file \ --from-code=UTF-8 XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \ --keyword=_ --keyword=N_ --keyword="Q_:1,2" -- 2.36.0.1.g15c4090757