From a024aba20c531675010ee9e48d7facd0df433c85 Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Fri, 23 Mar 2012 09:42:27 -0700 Subject: [PATCH] --- yaml --- r: 298230 b: refs/heads/master c: 7f3bd6c9cb8e9fa2b57bfa860cd3e734a28f48ed h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/scripts/setlocalversion | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 99180ff27109..79b54473a9c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9aaf440f8fabcebf9ea79a62ccf4c212e6544b49 +refs/heads/master: 7f3bd6c9cb8e9fa2b57bfa860cd3e734a28f48ed diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion index 4d403844e137..bd6dca8a0ab2 100755 --- a/trunk/scripts/setlocalversion +++ b/trunk/scripts/setlocalversion @@ -75,8 +75,7 @@ scm_version() [ -w . ] && git update-index --refresh --unmerged > /dev/null # Check for uncommitted changes - if git diff-index --name-only HEAD | grep -v "^scripts/package" \ - | read dummy; then + if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then printf '%s' -dirty fi