From 98f8ac3ee843a3cbba9275212421400cd8727aa0 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 12 Jun 2009 09:59:52 +0200 Subject: [PATCH] --- yaml --- r: 149543 b: refs/heads/master c: a2bb90a08cb3b64dd815d762ffde2312582a6ec9 h: refs/heads/master i: 149541: 5a705f4534e6011cae857fbc39aae0224d751924 149539: 667547ad71f78ec30552e8753ea744a6caf34a65 149535: a56a6f90f4cceb6cfdba67925f887cce07801de1 v: v3 --- [refs] | 2 +- trunk/scripts/setlocalversion | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e3f1f8eb261c..2eafbb3ca157 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2d8993026a26f4ece8c8b3f2e138d2ba8f18eaa +refs/heads/master: a2bb90a08cb3b64dd815d762ffde2312582a6ec9 diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion index 00790472f641..46989b88d734 100755 --- a/trunk/scripts/setlocalversion +++ b/trunk/scripts/setlocalversion @@ -39,8 +39,10 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then printf -- '-svn%s' "`git svn find-rev $head`" fi - # Are there uncommitted changes? - git update-index --refresh --unmerged > /dev/null + # Update index only on r/w media + [ -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 printf '%s' -dirty