Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 517794 - dev-vcs/git should install git-subtree manual
Summary: dev-vcs/git should install git-subtree manual
Status: RESOLVED UPSTREAM
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Development (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Robin Johnson
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-07-22 15:06 UTC by Georgi Rusev
Modified: 2019-06-12 21:29 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
dev-vcs/git-2.10.2 changed to include man pages for subtree and svn-fe (git-2.10.2.ebuild,18.82 KB, text/plain)
2017-02-13 19:22 UTC, Cornelius Weig
Details
corrected ebuild that installs man pages of non-standard git extensions (git-2.11.1.ebuild,18.90 KB, text/plain)
2017-02-14 23:37 UTC, Cornelius Weig
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Georgi Rusev 2014-07-22 15:06:17 UTC
$ git help subtree
No manual entry for git-subtree

Seems that the installation of the manpage for git-subtree is not consistant with the rest of the git manpages, and required the doc use flag, while the other core commands do not require it and are installed by default.
Comment 1 Georgi Rusev 2014-07-22 15:07:33 UTC
This was with git-1.8.5.5
Comment 2 Georgi Rusev 2014-07-22 15:12:34 UTC
There are actually several doc files in /usr/share/doc/git-1.8.5.5 that do not have corresponding man files in /usr/share/man/man1:

git-contacts
git-diffall
git-jump
git-prompt
git-subtree
git-tools

But I have not checked if the doc use flag affects them too or they are just always skipped.
Comment 3 Cornelius Weig 2017-02-13 19:21:13 UTC
The issue is still not resolved.

The reason for the discrepancy is that git-subtree resides in the contrib/ folder that is not installed by default. When the ebuild builds the man pages with `make -C Documentation/`, the contrib/ package is not considered. Note that the svn-fe command is also affected by this.

The following changes to the ebuild will also install the man pages for the two commands:

--- /usr/portage/dev-vcs/git/git-2.10.2.ebuild	2017-01-29 19:32:51.000000000 +0100
+++ git-2.10.2.ebuild	2017-02-13 20:17:41.409622853 +0100
@@ -356,8 +356,9 @@
 		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
 		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
 		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		git_emake svn-fe.1 || die "emake svn-fe.1 failed"
 		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+			git_emake svn-fe.html || die "emake svn-fe.html failed"
 		fi
 		cd "${S}"
 	fi
@@ -368,8 +369,8 @@
 	fi
 
 	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
+	git_emake git-subtree{,.1} || die "emake git-subtree failed"
+	use doc && git_emake git-subtree.html || die "emake git-subtree.html failed"
 
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
@@ -434,9 +435,9 @@
 
 	# git-subtree
 	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
+	git_emake install install-man || die "Failed to emake install git-subtree"
 	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+		git_emake install-html || die "Failed to emake install-html"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
@@ -470,9 +471,9 @@
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		dobin svn-fe
+		doman svn-fe.1
 		dodoc svn-fe.txt
 		if use doc ; then
-			doman svn-fe.1
 			docinto html
 			dodoc svn-fe.html
 		fi
Comment 4 Cornelius Weig 2017-02-13 19:22:49 UTC
Created attachment 463668 [details]
dev-vcs/git-2.10.2 changed to include man pages for subtree and svn-fe

diff of the changes can be found in my previous comment
Comment 5 Lars Wendler (Polynomial-C) (RETIRED) gentoo-dev 2017-02-14 12:49:12 UTC
Can't commit that change:

make[1]: Entering directory '/var/tmp/portage/dev-vcs/git-2.11.1/work/git-2.11.1'
make[1]: 'GIT-VERSION-FILE' is up to date.
make[1]: Leaving directory '/var/tmp/portage/dev-vcs/git-2.11.1/work/git-2.11.1'
sed -e '1s|#!.*/sh|#!/bin/sh|' git-subtree.sh >git-subtree
chmod +x git-subtree
asciidoc -b docbook -d manpage -f ../../Documentation/asciidoc.conf \
        -agit_version=2.11.1 git-subtree.txt
xmlto -m ../../Documentation/manpage-normal.xsl man git-subtree.xml
 * ERROR: dev-vcs/git-2.11.1::gentoo failed (compile phase):
 *   emake git-subtree.html failed
Comment 6 Cornelius Weig 2017-02-14 23:37:08 UTC
Created attachment 463780 [details]
corrected ebuild that installs man pages of non-standard git extensions
Comment 7 Cornelius Weig 2017-02-14 23:37:36 UTC
Sorry.. thoughtless neglect of operator precedence. I attached a corrected version that builds & installs (for me :).

Cheers
Comment 8 Larry the Git Cow gentoo-dev 2019-04-20 14:42:03 UTC
The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56312573763e794982d7a7284e7e7d1a8a9f8eaa

commit 56312573763e794982d7a7284e7e7d1a8a9f8eaa
Author:     Lars Wendler <polynomial-c@gentoo.org>
AuthorDate: 2019-04-20 14:41:46 +0000
Commit:     Lars Wendler <polynomial-c@gentoo.org>
CommitDate: 2019-04-20 14:41:46 +0000

    dev-vcs/git: Build/install some more man-pages without USE="doc"
    
    Thanks-to: Cornelius Weig <bitte.keine.werbung.einwerfen@googlemail.com>
    Bug: https://bugs.gentoo.org/517794
    Package-Manager: Portage-2.3.64, Repoman-2.3.12
    Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

 dev-vcs/git/git-9999-r1.ebuild | 19 +++++++++----------
 dev-vcs/git/git-9999-r2.ebuild | 19 +++++++++----------
 dev-vcs/git/git-9999-r3.ebuild | 19 +++++++++----------
 dev-vcs/git/git-9999.ebuild    | 19 +++++++++----------
 4 files changed, 36 insertions(+), 40 deletions(-)
Comment 9 Robin Johnson archtester Gentoo Infrastructure gentoo-dev Security 2019-06-11 15:37:18 UTC
I have reverted the git-subtree part of this change, because building the git-subtree manpage requires the full USE=doc stack in the ebuild.

Please ask upstream Git to include contrib directory in the prebuilt manpages & html tarball.
Comment 10 Lars Wendler (Polynomial-C) (RETIRED) gentoo-dev 2019-06-12 21:29:15 UTC
*** Bug 687966 has been marked as a duplicate of this bug. ***