Thread (7 messages) flat view 7 messages, 5 authors, 2016-06-15

[PATCH/RFC] Make git-completion.bash a first-class citizen

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:44:11
Subsystem: kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers: Nathan Chancellor, Nicolas Schier, Linus Torvalds

This moves git-completion.bash out of contrib/, and installs it to
$sharedir/git-completion/

Signed-off-by: Johannes Schindelin <redacted>
---

	On Fri, 8 Feb 2008, Steffen Prohaska wrote:
	
	> On Feb 8, 2008, at 1:25 PM, Johannes Schindelin wrote:
	> 
	> > On Fri, 8 Feb 2008, Steffen Prohaska wrote:
	> > 
	> > > This improved prompt is great.  I already miss it each time 
	> > > I switch back from next to master.
	> > 
	> > Maybe we (as in msysgit) should install the 
	> > git-completion.bash script into /share/git-core/?
	> 
	> Yes.

	How about this?

 Makefile                                           |    4 ++++
 .../git-completion.bash => git-completion.bash     |    0 
 2 files changed, 4 insertions(+), 0 deletions(-)
 rename contrib/completion/git-completion.bash => git-completion.bash (100%)
diff --git a/Makefile b/Makefile
index de8c752..77efc3f 100644
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,7 @@ gitexecdir = $(bindir)
 sharedir = $(prefix)/share
 template_dir = $(sharedir)/git-core/templates
 htmldir=$(sharedir)/doc/git-doc
+completiondir = $(sharedir)/git-completion
 ifeq ($(prefix),/usr)
 sysconfdir = /etc
 else
@@ -784,6 +785,7 @@ bindir_SQ = $(subst ','\'',$(bindir))
 mandir_SQ = $(subst ','\'',$(mandir))
 infodir_SQ = $(subst ','\'',$(infodir))
 gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
+completiondir_SQ = $(subst ','\'',$(completiondir))
 template_dir_SQ = $(subst ','\'',$(template_dir))
 htmldir_SQ = $(subst ','\'',$(htmldir))
 prefix_SQ = $(subst ','\'',$(prefix))
@@ -1067,6 +1069,8 @@ install: all
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 	$(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
+	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(completiondir_SQ)'
+	$(INSTALL) git-completion.bash '$(DESTDIR_SQ)$(completiondir_SQ)'
 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
 ifndef NO_TCLTK
diff --git a/contrib/completion/git-completion.bash b/git-completion.bash
similarity index 100%
rename from contrib/completion/git-completion.bash
rename to git-completion.bash
-- 
1.5.4.1261.g18335
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help