Make GIT-VERSION-GEN tolerate missing git describe command
PATCH 1/1 Make GIT-VERSION-GEN tolerate missing git describe command
I think it is probably a bug that "git non_existent_command" returns its error message to stdout without an error, where "git-non_existent_command" behaves differently and does return an error.
Older versions of git did not implement "git describe" and GIT-VERSION-GEN produces an empty version string if run on a system with such a git installed. The consequence is that "make rpm" fails.
This patch fixes GIT-VERSION-GEN so that it works in the absence of a working "git describe"
----------------------------------------
GIT-VERSION-GEN +1 -1
@@ -2,7 +2,7 @@ GVF=GIT-VERSION-FILE -VN=$(git describe --abbrev=4 HEAD 2>/dev/null) || VN=v1.0.GIT +VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) || VN=v1.0.GIT VN=$(expr "$VN" : v'\(.*\)') if test -r $GVF then
----------------------------------------
Quoted 6 lines · John Ellson
I think it is probably a bug that "git
non_existent_command" returns its error message to stdout without an error, where "git-non_existent_command" behaves differently and does return an error.
Quoted 7 lines
Older versions of git did not implement "git describe" and GIT-VERSION-GEN produces an empty version string if run on a system with such a git installed. The consequence is that "make rpm" fails.
This patch fixes GIT-VERSION-GEN so that it works in the absence of a working "git describe"
Shouldn't you make "git.c" return an error too, so that "git-describe" and "git describe" both fail properly?
I realize that you'd want to do your patch _too_ (in case somebody has an old version of "git" installed), but I just think it would be sensible to fix the problem that causes this in the first place..
Continuing to output to stdout rather than stderr is probably a good idea (so that it's easy to do "git help | less" or something), but yeah, I think an unrecognized command should at least return an error.
Linus
Quoted 16 lines · Linus Torvalds
Quoted 5 lines · John Ellson
I think it is probably a bug that "git
non_existent_command" returns its error message to stdout without an error, where "git-non_existent_command" behaves differently and does return an error.Quoted 8 lines
Older versions of git did not implement "git describe" and GIT-VERSION-GEN produces an empty version string if run on a system with such a git installed. The consequence is that "make rpm" fails.
This patch fixes GIT-VERSION-GEN so that it works in the absence of a working "git describe"
Quoted 8 lines
Shouldn't you make "
git.c" return an error too, so that "git-describe" and "git describe" both fail properly?I realize that you'd want to do your patch _too_ (in case somebody has an old version of "git" installed), but I just think it would be sensible to fix the problem that causes this in the first place..
Continuing to output to stdout rather than stderr is probably a good idea (so that it's easy to do "git help | less" or something), but yeah, I think an unrecognized command should at least return an error.
Linus
I checked and that bug has been fixed since the older version of git that was causing me problems. "git non_existent_command" now returns 1. However, the error message was also changed to
goto stderr, which it sounds like you disagree with? Personally
I don't have a problem with it, although a real "git-help" command might be a good idea too.
John
Quoted 3 lines · John Ellson
I checked and that bug has been fixed since the older version of git that was causing me problems. "git
non_existent_command" now returns 1.
Ahh, good.
Quoted 2 lines
However, the error message was also changed to goto stderr, which it sounds like you disagree with?
Not that I can see:
[torvalds@g5 ~]$ git --version git version 1.0.6-g58e3 [torvalds@g5 ~]$ git hjsdhjas > /dev/null [torvalds@g5 ~]$ echo $? 1
so yes, it returns a proper error, and it outputs the help message to stdout, not stderr. Which is fine, because it means that you can indeed do
git help | less
and it will do the right thing (apart from printing the line
git: 'help' is not a git-command
which is a bit sad).
Linus
Quoted 4 lines · John Ellson
I think it is probably a bug that "git
non_existent_command" returns its error message to stdout without an error, where "git-non_existent_command" behaves differently and does return an error.
BTW. Its the old shell-script version of "git" that fails to return an error on non_existent_commands. The newer C version of "git" correctly returns an error code.
The reason that this is a sufficiently serious problem to require a fix is that the broken version of "git" is in the git-core-0.99.9a-2.fc5.i386.rpm that is currently in Fedora Core Extras development.
John
Quoted 8 lines · John Ellson
Quoted 4 lines · John Ellson
I think it is probably a bug that "git
non_existent_command" returns its error message to stdout without an error, where "git-non_existent_command" behaves differently and does return an error.
Quoted 4 lines
BTW. Its the old shell-script version of "git" that fails to return an error on
non_existent_commands. The newer C version of "git" correctly returns an error code.The reason that this is a sufficiently serious problem to require a fix is that the broken version of "git" is in the git-core-0.99.9a-2.fc5.i386.rpm that is currently in Fedora Core Extras development.
It has been fixed. What's broken is that Fedora Extras still contains 0.99.9a which is totally ancient.
-hpa