Skip to content

Commit 2be50ea

Browse files
dschopatthoyts
authored andcommitted
Windows resource: handle dashes in the Git version gracefully
Reported by postiffm as issue git#14. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent ce39c2e commit 2be50ea

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
17771777

17781778
git.res: git.rc
17791779
$(QUIET_RC)$(RC) \
1780-
$(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst ., ,$(GIT_VERSION)))) \
1780+
$(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
17811781
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
17821782

17831783
ifndef NO_PERL

0 commit comments

Comments
 (0)