Jiang Xin [off-list ref] writes:

From: Jiang Xin <redacted>

We will feed xgettext with more C souce files and in different order in

"source"

subsequent commit. To generate a stable "po/git.pot" regardless of the
number and order of input source files, we add a new option
"--sort-by-file" to xgettext program.

Probably: ... we pass the option "--sort-by-file"

With this update, the newly generated "po/git.pot" will has the same

"will have"

entries while in a different order.

With the help of a custom diff driver as shown below,

    git config --global diff.gettext-fmt.textconv \
        "msgcat --no-location --sort-by-file"

and appending a new entry "*.po diff=gettext-fmt" to git attributes,
we can see that there are no substantial changes in "po/git.pot".

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

This has no input from me (yet), so technically it is a bit
premature to add my sign-off here.  It wouldn't make a difference to
the end result, though ;-)