diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-10-01 15:59:13 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-10-01 18:13:18 +0200 |
| commit | 06f1900265b7357e5b245963fc913fd6a70f85e9 (patch) | |
| tree | 95709cd52c1d2d00512bc9f9a660ad783cc2412c /crawl-ref/source/Makefile | |
| parent | cae65ffbebd4a49ee2b7cc116de12d4aa0f85226 (diff) | |
| download | crawl-ref-06f1900265b7357e5b245963fc913fd6a70f85e9.tar.gz crawl-ref-06f1900265b7357e5b245963fc913fd6a70f85e9.zip | |
Fix make tx-commit not working if changes are staged.
Diffstat (limited to 'crawl-ref/source/Makefile')
| -rw-r--r-- | crawl-ref/source/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index 19a0749907..76a2ecf36a 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -1572,10 +1572,10 @@ tx-check: $(TX-INI) $(TX-MKTXT) -w $(TX-TRANS);\ tx-commit: - @if git diff --quiet $(TX-TXT); then\ + @if git diff HEAD --quiet $(TX-TXT); then\ exit 0;\ fi;\ - git diff $(TX-TXT);\ + git diff HEAD $(TX-TXT);\ read -p "Commit? (Y/n) " RESP;\ if [ "$$RESP" = n -o "$$RESP" = N ]; then\ exit 1;\ |