diff options
| author | Matt McCutchen <hashproduct@gmail.com> | 2007-07-10 03:30:39 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-10 08:39:59 +0200 |
| commit | 54dadbdb29668fbd51effefd0a0c65d915f5422b (patch) | |
| tree | 9226670da09c548cc5a8c5344a87020a83c0eec4 /git-rebase--interactive.sh | |
| parent | rerere: record resolution even if file is not in merge base (diff) | |
| download | git-54dadbdb29668fbd51effefd0a0c65d915f5422b.tar.xz git-54dadbdb29668fbd51effefd0a0c65d915f5422b.zip | |
Makefile: rebuild git.o on version change, clean up git$X flags
Commit 334d28ae factored out git.o as an intermediate stage between
git.c and git$X. However:
- It left some no-longer-relevant flags in the rule for git$X.
- It failed to replace git$X with git.o in the list of files that
record GIT_VERSION. This broke incorporation of a changed
GIT_VERSION into git$X because, when GIT_VERSION changes, git.o isn't
remade and git$X is relinked from the git.o that still contains the
old GIT_VERSION.
This patch removes the irrelevant flags and fixes incorporation of a
changed GIT_VERSION into git$X.
Signed-off-by: Matt McCutchen <hashproduct@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
0 files changed, 0 insertions, 0 deletions