From: Junio C Hamano <junkio@cox.net>
Date: Mon, 12 Mar 2007 18:43:22 +0000 (-0700)
Subject: Merge branch 'maint' of git://repo.or.cz/git-gui into maint
X-Git-Tag: v1.5.0.4~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ed02de2f46105cbc45fcc8f3287513f470eb4a3;p=git.git

Merge branch 'maint' of git://repo.or.cz/git-gui into maint

* 'maint' of git://repo.or.cz/git-gui:
  git-gui: Allow 'git gui version' outside of a repository
  git-gui: Revert "git-gui: Display all authors of git-gui."
  git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
  git-gui: Allow committing empty merges
---

3ed02de2f46105cbc45fcc8f3287513f470eb4a3
diff --cc git-gui/.gitignore
index 805ca2e1c,000000000..c714d382e
mode 100644,000000..100644
--- a/git-gui/.gitignore
+++ b/git-gui/.gitignore
@@@ -1,4 -1,0 +1,3 @@@
- CREDITS-FILE
 +GIT-VERSION-FILE
 +git-citool
 +git-gui
diff --cc git-gui/Makefile
index e486e8f98,000000000..d74fca287
mode 100644,000000..100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@@ -1,69 -1,0 +1,64 @@@
 +all::
 +
 +# Define V=1 to have a more verbose compile.
 +#
 +
 +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 +	@$(SHELL_PATH) ./GIT-VERSION-GEN
 +-include GIT-VERSION-FILE
 +
++SCRIPT_SH = git-gui.sh
 +GITGUI_BUILT_INS = git-citool
- ALL_PROGRAMS = git-gui $(GITGUI_BUILT_INS)
++ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
 +
 +ifndef SHELL_PATH
 +	SHELL_PATH = /bin/sh
 +endif
 +
 +ifndef gitexecdir
 +	gitexecdir := $(shell git --exec-path)
 +endif
 +
 +ifndef INSTALL
 +	INSTALL = install
 +endif
 +
 +ifndef V
 +	QUIET_GEN      = @echo '   ' GEN $@;
 +	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 +endif
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 +
- git-gui: git-gui.sh GIT-VERSION-FILE CREDITS-FILE
++$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 +	$(QUIET_GEN)rm -f $@ $@+ && \
- 	sed -n \
- 		-e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
++	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +		-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
- 		-e '1,/^set gitgui_credits /p' \
 +		$@.sh >$@+ && \
- 	cat CREDITS-FILE >>$@+ && \
- 	sed -e '1,/^set gitgui_credits /d' $@.sh >>$@+ && \
 +	chmod +x $@+ && \
 +	mv $@+ $@
 +
- CREDITS-FILE: CREDITS-GEN .FORCE-CREDITS-FILE
- 	$(QUIET_GEN)$(SHELL_PATH) ./CREDITS-GEN
- 
 +$(GITGUI_BUILT_INS): git-gui
 +	$(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
 +
++# These can record GITGUI_VERSION
++$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE
++
 +all:: $(ALL_PROGRAMS)
 +
 +install: all
 +	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
 +
- dist-version: CREDITS-FILE
++dist-version:
 +	@mkdir -p $(TARDIR)
 +	@echo $(GITGUI_VERSION) > $(TARDIR)/version
- 	@cat CREDITS-FILE > $(TARDIR)/credits
 +
 +clean::
- 	rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE CREDITS-FILE
++	rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE
 +
 +.PHONY: all install dist-version clean
 +.PHONY: .FORCE-GIT-VERSION-FILE
- .PHONY: .FORCE-CREDITS-FILE