From 11d8781a3f8dc4a80128f9ec82644c05ae16f6ec Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 14 Nov 2013 11:59:22 +0000 Subject: 31983: suppress warning from cmp when genering patchlevel.h. The warning doesn't indicate a problem, so isn't useful. --- ChangeLog | 3 +++ Src/zsh.mdd | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c22054372..e22c2e746 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2013-11-14 Peter Stephenson + * 31983: Src/zsh.mdd: suppress warning from cmp that doesn't + indicate a problem when generating patchlevel header. + * 31982: Src/math.c, Test/C01arith.ztst: detection of floating point constants had run rampant in users/17445. Fix the original problem another way. diff --git a/Src/zsh.mdd b/Src/zsh.mdd index 4bc884b3d..d77fc4336 100644 --- a/Src/zsh.mdd +++ b/Src/zsh.mdd @@ -44,7 +44,7 @@ patchlevel.h: FORCE cp -f $(sdir)/$@.release $@; \ else \ echo '#define ZSH_PATCHLEVEL "'`cd $(sdir) && git describe --tags --long`'"' > $@.tmp; \ - cmp $@ $@.tmp && rm -f $@.tmp || mv $@.tmp $@; \ + cmp $@ $@.tmp 2>/dev/null && rm -f $@.tmp || mv $@.tmp $@; \ fi FORCE: -- cgit 1.4.1