aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Anderson <[email protected]>2010-12-24 16:01:42 -0500
committerGraydon Hoare <[email protected]>2011-01-03 11:06:52 -0800
commitc90d114d36e83ee8b58fc8c3354f9a9b83459437 (patch)
tree2be01472414c31f7127ee0da7bcfb960da530e06
parentDon't attempt to wake tasks that aren't blocked. (diff)
downloadrust-c90d114d36e83ee8b58fc8c3354f9a9b83459437.tar.xz
rust-c90d114d36e83ee8b58fc8c3354f9a9b83459437.zip
Use git log pretty printing arguments that are compatible with older versions of git
-rw-r--r--doc/Makefile2
-rw-r--r--src/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 4d3a7d03..15808de6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -4,7 +4,7 @@ all: rust.pdf rust.html
version.texi: Makefile rust.texi
git log -1 \
- --format='@macro gitversion%n%h %ci%n@end macro%n' >$@
+ --pretty=format:'@macro gitversion%n%h %ci%n@end macro%n' >$@
%.pdf: %.texi version.texi
texi2pdf $<
diff --git a/src/Makefile b/src/Makefile
index 6b77ac84..37f6aea3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -297,7 +297,7 @@ all: $(CFG_RUSTC) $(MKFILES) $(GENERATED)
boot/util/version.ml: Makefile
$(CFG_QUIET)git log -1 \
- --format='let version = "prerelease (%h %ci)";;' >$@ || exit 1
+ --pretty=format:'let version = "prerelease (%h %ci)";;' >$@ || exit 1
loc:
$(CFG_QUIET)wc -l $(BOOT_MLS) $(RUNTIME_CS) $(RUNTIME_HDR)