diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-28 11:21:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-28 11:21:46 -0700 |
| commit | cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea (patch) | |
| tree | 1dec0df37dae5154604064c4c8a8b50e90058a16 /Makefile | |
| parent | c1e01b0c5106451770ae77a62f52acfe814c3326 (diff) | |
| parent | 7c3baa9abf0abe15f068d95688bbc27e73a69042 (diff) | |
| download | git-cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea.tar.xz | |
Merge branch 'maint'
* maint:
help -a: do not unnecessarily look for a repository
Do not try to remove directories when removing old links
rebase -i: more graceful handling of invalid commands
help -i: properly error out if no info viewer can be found
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1375,7 +1375,7 @@ SHELL = $(SHELL_PATH) all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS ifneq (,$X) - $(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$p' -ef '$p$X' || $(RM) '$p';) + $(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';) endif all:: |