]> git.tue.mpg.de Git - lopsub.git/commit
projects / lopsub.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 816fbbb) | patch
version-gen.sh: Make it work in conflicted state.
authorAndre Noll <maan@tuebingen.mpg.de>
Wed, 12 Jul 2017 09:33:48 +0000 (11:33 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Tue, 28 Nov 2017 09:54:24 +0000 (10:54 +0100)
commit7606d1c3e5626ecd9d6ec8fbf76b3a2507251dd7
tree1cf77352ba1b32080ada3c57bd7c0a854bdc7547tree | snapshot
parent816fbbbd5df22d732ab649fa9e264b7b6a27227acommit | diff
version-gen.sh: Make it work in conflicted state.

If the working tree contains unmerged paths, git update-index -q
prints a "file: needs merge" message to stdout. This message confuses
the build system which runs this git command via version-gen.sh and
expects it to output a git version string.

This commit redirects stdout of the git command to /dev/null to make
sure that version-gen.sh outputs only the version string.
version-gen.sh diff | blob | history
lopsub - the long option parser for subcommands