Tell `git revert` not to follow renames (CVE-2016-10026)

[git.ikiwiki.info.git] / po / Makefile

diff --git a/po/Makefile b/po/Makefile
index 97fc0bca9bf3ce5da9ec309565e3dad7a7b6043e..5ec4a157c6ddbb0fdfcdea3d117730b3cb2ea266 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -47,15 +47,15 @@ clean:
        @echo -n "Merging ikiwiki.pot and $@"
 # Typically all that changes is a date or line number. I'd prefer not to
 # commit such changes, so detect and ignore them.
-       @if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then
+       @if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then \
                echo "unable to run msgmerge"; \
-       else; \
+       else \
                if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
                        mv -f $@.new $@; \
                else \
                        rm -f $@.new; \
-               fi
-               @msgfmt --statistics $@ 2>&1
+               fi; \
+               msgfmt --statistics $@ 2>&1; \
        fi
 
 check: