On Wed, Dec 04, 2024 at 10:50:43AM -0500, Paymon wrote:
> On Wed, Dec 04, 2024 at 08:41:44AM +0000, ossi via isync-devel wrote:
> > commit 8920b6a1db443aac00783f7754a05852bb1bc71c
> > Author: Paymon MARANDI <[email protected]>
> > AuthorDate: Tue Dec 3 15:25:09 2024 -0500
> > Commit: Oswald Buddenhagen <[email protected]>
> > CommitDate: Wed Dec 4 09:36:28 2024 +0100
> >
> > build: also consider builds off of git with `git clone --depth 1`
> >
> > one case where this could happen is a shallow clone, purely for build
> > purposes. in source based distros, like gentoo, setting depth of the
> > clone to 1, globally, is a common configuration. this patch avoids that
> > those builds fail.
> >
> > Signed-off-by: Paymon MARANDI <[email protected]>
> >
> > version.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/version.sh b/version.sh
> > index fc1ed7d..5dfc61b 100755
> > --- a/version.sh
> > +++ b/version.sh
> > @@ -22,7 +22,7 @@ else
> > # find out whether we have local work, and if so, collapse it into
> > # a single suffix. otherwise, we'd cause pointless rebuilds during
> > # development.
> > - gver=$(git describe --tags $mb)
> > + gver=$(git describe --always --tags $mb)
> > lcl=$(git rev-list -n 1 $mb..HEAD)
> > if test -n "$lcl"; then
> > gver="$gver-plus"
> >
> >
>
> it turns out that this doesn't cover the gentoo case. $mb is always going to
> come up empty! i should have tested... i will submit a revised version.
>
> --
>
> Paymon
spoke to early; it's git-branch that returns something like this:
* (HEAD detached at refs/git-r3/HEAD)
that escapes our regex.
i would pass `--always` unconditionally to be defensive about it; what do you
think?
--
Paymon
_______________________________________________
isync-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/isync-devel
