mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jd/subtree'
* jd/subtree: contrib/subtree: allow adding an annotated tag contrib/subtree/Makefile: clean up rule for "clean" contrib/subtree/Makefile: clean up rules to generate documentation contrib/subtree/Makefile: s/libexecdir/gitexecdir/ contrib/subtree/Makefile: use GIT-VERSION-FILE contrib/subtree/Makefile: scrap unused $(gitdir)
This commit is contained in:
commit
7173ad76ed
|
@ -3,17 +3,23 @@
|
|||
|
||||
prefix ?= /usr/local
|
||||
mandir ?= $(prefix)/share/man
|
||||
libexecdir ?= $(prefix)/libexec/git-core
|
||||
gitdir ?= $(shell git --exec-path)
|
||||
gitexecdir ?= $(prefix)/libexec/git-core
|
||||
man1dir ?= $(mandir)/man1
|
||||
|
||||
gitver ?= $(word 3,$(shell git --version))
|
||||
../../GIT-VERSION-FILE: FORCE
|
||||
$(MAKE) -C ../../ GIT-VERSION-FILE
|
||||
|
||||
-include ../../GIT-VERSION-FILE
|
||||
|
||||
# this should be set to a 'standard' bsd-type install program
|
||||
INSTALL ?= install
|
||||
INSTALL ?= install
|
||||
RM ?= rm -f
|
||||
|
||||
ASCIIDOC_CONF = ../../Documentation/asciidoc.conf
|
||||
MANPAGE_NORMAL_XSL = ../../Documentation/manpage-normal.xsl
|
||||
ASCIIDOC = asciidoc
|
||||
XMLTO = xmlto
|
||||
|
||||
ASCIIDOC_CONF = ../../Documentation/asciidoc.conf
|
||||
MANPAGE_XSL = ../../Documentation/manpage-normal.xsl
|
||||
|
||||
GIT_SUBTREE_SH := git-subtree.sh
|
||||
GIT_SUBTREE := git-subtree
|
||||
|
@ -31,8 +37,8 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)
|
|||
doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML)
|
||||
|
||||
install: $(GIT_SUBTREE)
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)
|
||||
$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir)
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)
|
||||
$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir)
|
||||
|
||||
install-doc: install-man
|
||||
|
||||
|
@ -41,19 +47,21 @@ install-man: $(GIT_SUBTREE_DOC)
|
|||
$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
|
||||
|
||||
$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
|
||||
xmlto -m $(MANPAGE_NORMAL_XSL) man $^
|
||||
$(XMLTO) -m $(MANPAGE_XSL) man $^
|
||||
|
||||
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
|
||||
asciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \
|
||||
-agit_version=$(gitver) $^
|
||||
$(ASCIIDOC) -b docbook -d manpage -f $(ASCIIDOC_CONF) \
|
||||
-agit_version=$(GIT_VERSION) $^
|
||||
|
||||
$(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
|
||||
asciidoc -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
|
||||
-agit_version=$(gitver) $^
|
||||
$(ASCIIDOC) -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
|
||||
-agit_version=$(GIT_VERSION) $^
|
||||
|
||||
test:
|
||||
$(MAKE) -C t/ test
|
||||
|
||||
clean:
|
||||
rm -f *~ *.xml *.html *.1
|
||||
rm -rf subproj mainline
|
||||
$(RM) $(GIT_SUBTREE)
|
||||
$(RM) *.xml *.html *.1
|
||||
|
||||
.PHONY: FORCE
|
||||
|
|
|
@ -558,8 +558,9 @@ cmd_add_commit()
|
|||
commit=$(add_squashed_msg "$rev" "$dir" |
|
||||
git commit-tree $tree $headp -p "$rev") || exit $?
|
||||
else
|
||||
revp=$(peel_committish "$rev") &&
|
||||
commit=$(add_msg "$dir" "$headrev" "$rev" |
|
||||
git commit-tree $tree $headp -p "$rev") || exit $?
|
||||
git commit-tree $tree $headp -p "$revp") || exit $?
|
||||
fi
|
||||
git reset "$commit" || exit $?
|
||||
|
||||
|
|
Loading…
Reference in a new issue