On 15-12-2015 12:02, Aline Manera wrote:
Hi Lucio,
Even with this patch, I continue to get the "fatal: No names found,
cannot describe anything." error msg when building Wok.
After a investigation, I noticed you added the --always flag only in
Makefile.am but the git-describe command is also used in
build-aux/pkg-version.
alinefm@alinefm-ThinkPad-T440:~/wok$ git grep "git describe"
Makefile.am: git describe --abbrev=0 --always > $@; \
build-aux/pkg-version: PKG_VERSION=`git describe --tags --match
"[0-9]*" || cat VERSION`
If you update build-aux/pkg-version to use the --always flag all errors
are gone.
Please, do it and resend the patch.
Hi Aline,
The pkg-version code is perfect. It falls back to the contents of
VERSION file in the tree (despite the errors throwed).
If I add --always flag to it, then the fallback will be the hash of HEAD
commit and we can discard "|| cat VERSION" since git describe
will always work. Is this really wanted just to avoid the error messages?
Regards,
Aline Manera
On 14/12/2015 15:37, Lucio Correia wrote:
> Since new repositories don't have tags in their git
> history yet, git-describe was failing. This fix uses
> always flag to return the hash of latest commit as a
> fallback to version number.
>
> Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
> ---
> Makefile.am | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 106a577..278bda1 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -158,7 +158,7 @@ uninstall-local:
>
> VERSION:
> @if test -d .git; then \
> - git describe --abbrev=0 > $@; \
> + git describe --abbrev=0 --always > $@; \
> fi
>
> .PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION
--
Lucio Correia
Software Engineer
IBM LTC Brazil