From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 12 Mar 2007 17:26:59 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: gitgui-0.6.5^0
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2ec0cb7959b0bf965d54f95453f5b4b34e8d3100?ds=inline;hp=-c

Merge branch 'maint'

* maint:
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
---

2ec0cb7959b0bf965d54f95453f5b4b34e8d3100
diff --combined Makefile
index a219b5d476,d74fca2874..b82789ead6
--- a/Makefile
+++ b/Makefile
@@@ -7,8 -7,9 +7,9 @@@ GIT-VERSION-FILE: .FORCE-GIT-VERSION-FI
  	@$(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
@@@ -27,33 -28,24 +28,29 @@@ ifndef 
  	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
  endif
  
 +ifeq ($(findstring $(MAKEFLAGS),s),s)
 +QUIET_GEN =
 +QUIET_BUILT_IN =
 +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
@@@ -61,14 -53,12 +58,12 @@@
  	$(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