| Message ID | orboieypq9.fsf@livre.localdomain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Applied to next branch (will become v0.51). On Tue, 14 Aug 2012, Alexandre Oliva wrote: > Support srcdir != . looking for .git in srcdir when computing the ceph > release and git tag. > > Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br> > --- > src/check_version | 9 +++++---- > 1 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/src/check_version b/src/check_version > index e31ca49..8600c55 100755 > --- a/src/check_version > +++ b/src/check_version > @@ -1,12 +1,13 @@ > #!/bin/sh > > -if [ ! -d ../.git ]; then > - echo "not updating .git_version (no ../.git)" > +dname=`dirname $0` > + > +if [ ! -d $dname/../.git ]; then > + echo "not updating .git_version (no $dname/../.git)" > exit 0 > fi > > -dname=`dirname $0` > -cur=`git rev-parse HEAD 2>/dev/null; git describe 2>/dev/null` > +cur=`cd $dname && git rev-parse HEAD 2>/dev/null; git describe 2>/dev/null` > [ -e $1 ] && old=`cat $1` > > if [ "$cur" != "$old" ]; then > -- > 1.7.7.6 > > -- > Alexandre Oliva, freedom fighter http://FSFLA.org/~lxoliva/ > You must be the change you wish to see in the world. -- Gandhi > Be Free! -- http://FSFLA.org/ FSF Latin America board member > Free Software Evangelist Red Hat Brazil Compiler Engineer > -- > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/src/check_version b/src/check_version index e31ca49..8600c55 100755 --- a/src/check_version +++ b/src/check_version @@ -1,12 +1,13 @@ #!/bin/sh -if [ ! -d ../.git ]; then - echo "not updating .git_version (no ../.git)" +dname=`dirname $0` + +if [ ! -d $dname/../.git ]; then + echo "not updating .git_version (no $dname/../.git)" exit 0 fi -dname=`dirname $0` -cur=`git rev-parse HEAD 2>/dev/null; git describe 2>/dev/null` +cur=`cd $dname && git rev-parse HEAD 2>/dev/null; git describe 2>/dev/null` [ -e $1 ] && old=`cat $1` if [ "$cur" != "$old" ]; then
Support srcdir != . looking for .git in srcdir when computing the ceph release and git tag. Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br> --- src/check_version | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)