Skip to content

Commit ea97ad8

Browse files
committed
Merge branch 'master' of https://github.com/j6t/git-gui
* 'master' of https://github.com/j6t/git-gui: git-gui: silence install recipes under "make -s" git-gui: add gui and pick as explicit subcommands git-gui: check browser/blame arguments carefully git-gui: allow specifying path '.' to the browser git-gui: try harder to find worktree from gitdir git-gui: simplify [is_bare] to report if a worktree is known git-gui: use git rev-parse for worktree discovery git-gui: use rev-parse exclusively to find a repository git-gui: use --absolute-git-dir git-gui: do not change global vars in choose_repository::pick git-gui: guard set/unset of GIT_DIR and GIT_WORK_TREE git-gui: remove unnecessary 'cd $_gitworktree' from do_gitk git-gui: use HEAD as current branch when detached
2 parents 45d10e1 + 1b2c2a2 commit ea97ad8

3 files changed

Lines changed: 224 additions & 179 deletions

File tree

git-gui/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ REMOVE_F0 = $(RM_RF) # space is required here
6464
REMOVE_F1 =
6565
CLEAN_DST = true
6666

67+
ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s)
6768
ifndef V
6869
QUIET = @
6970
QUIET_GEN = $(QUIET)echo ' ' GEN '$@' &&
@@ -89,6 +90,7 @@ ifndef V
8990
REMOVE_F0 = dst=
9091
REMOVE_F1 = && echo ' ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst"
9192
endif
93+
endif
9294

9395
TCLTK_PATH ?= wish
9496
ifeq (./,$(dir $(TCLTK_PATH)))
@@ -97,10 +99,6 @@ else
9799
TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH)))
98100
endif
99101

100-
ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
101-
QUIET_GEN =
102-
endif
103-
104102
-include config.mak
105103

106104
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))

0 commit comments

Comments
 (0)