--- a/components/git/git.p5m Sat Apr 02 01:55:18 2016 +0100
+++ b/components/git/git.p5m Thu Mar 24 11:12:03 2016 -0700
@@ -18,11 +18,16 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr/lib/git-core/.* -> default mode 0555>
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+<transform file path=usr/perl5/.*/man/(.*) -> emit link \
+ path=/usr/share/man/%<1> target=../../../perl5/$(PERL_VERSION)/man/%<1>>
+#
set name=pkg.fmri \
value=pkg:/developer/versioning/git@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="git - Fast Version Control System"
@@ -36,44 +41,49 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=LSARC/2008/360
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
dir path=usr
dir path=usr/bin
-hardlink path=usr/bin/git target=../lib/git-core/git-cherry-pick
+hardlink path=usr/bin/git target=../lib/git-core/git
hardlink path=usr/bin/git-cvsserver target=../lib/git-core/git-cvsserver
-hardlink path=usr/bin/git-receive-pack target=../lib/git-core/git-cherry-pick
+hardlink path=usr/bin/git-receive-pack target=../lib/git-core/git
hardlink path=usr/bin/git-shell target=../lib/git-core/git-shell
-hardlink path=usr/bin/git-upload-archive target=../lib/git-core/git-cherry-pick
+hardlink path=usr/bin/git-upload-archive target=../lib/git-core/git
hardlink path=usr/bin/git-upload-pack target=../lib/git-core/git-upload-pack
file path=usr/bin/gitk
dir path=usr/lib
dir path=usr/lib/git-core
-hardlink path=usr/lib/git-core/git target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-add target=git-cherry-pick
+file path=usr/lib/git-core/git
+hardlink path=usr/lib/git-core/git-add target=git
file path=usr/lib/git-core/git-add--interactive
-file path=usr/lib/git-core/git-am
-hardlink path=usr/lib/git-core/git-annotate target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-apply target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-am target=git
+hardlink path=usr/lib/git-core/git-annotate target=git
+hardlink path=usr/lib/git-core/git-apply target=git
file path=usr/lib/git-core/git-archimport
-hardlink path=usr/lib/git-core/git-archive target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-archive target=git
file path=usr/lib/git-core/git-bisect
-hardlink path=usr/lib/git-core/git-bisect--helper target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-blame target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-branch target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-bundle target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-cat-file target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-check-attr target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-check-ref-format target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-checkout target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-checkout-index target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-cherry target=git-cherry-pick
-file path=usr/lib/git-core/git-cherry-pick
+hardlink path=usr/lib/git-core/git-bisect--helper target=git
+hardlink path=usr/lib/git-core/git-blame target=git
+hardlink path=usr/lib/git-core/git-branch target=git
+hardlink path=usr/lib/git-core/git-bundle target=git
+hardlink path=usr/lib/git-core/git-cat-file target=git
+hardlink path=usr/lib/git-core/git-check-attr target=git
+hardlink path=usr/lib/git-core/git-check-ignore target=git
+hardlink path=usr/lib/git-core/git-check-mailmap target=git
+hardlink path=usr/lib/git-core/git-check-ref-format target=git
+hardlink path=usr/lib/git-core/git-checkout target=git
+hardlink path=usr/lib/git-core/git-checkout-index target=git
+hardlink path=usr/lib/git-core/git-cherry target=git
+hardlink path=usr/lib/git-core/git-cherry-pick target=git
hardlink path=usr/lib/git-core/git-citool target=git-gui
-hardlink path=usr/lib/git-core/git-clean target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-clone target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-commit target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-commit-tree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-config target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-count-objects target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-clean target=git
+hardlink path=usr/lib/git-core/git-clone target=git
+hardlink path=usr/lib/git-core/git-column target=git
+hardlink path=usr/lib/git-core/git-commit target=git
+hardlink path=usr/lib/git-core/git-commit-tree target=git
+hardlink path=usr/lib/git-core/git-config target=git
+hardlink path=usr/lib/git-core/git-count-objects target=git
+hardlink path=usr/lib/git-core/git-credential target=git
file path=usr/lib/git-core/git-credential-cache
file path=usr/lib/git-core/git-credential-cache--daemon
file path=usr/lib/git-core/git-credential-store
@@ -81,140 +91,147 @@
file path=usr/lib/git-core/git-cvsimport
file path=usr/lib/git-core/git-cvsserver
file path=usr/lib/git-core/git-daemon
-hardlink path=usr/lib/git-core/git-describe target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff-files target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff-index target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-diff-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-describe target=git
+hardlink path=usr/lib/git-core/git-diff target=git
+hardlink path=usr/lib/git-core/git-diff-files target=git
+hardlink path=usr/lib/git-core/git-diff-index target=git
+hardlink path=usr/lib/git-core/git-diff-tree target=git
file path=usr/lib/git-core/git-difftool
file path=usr/lib/git-core/git-difftool--helper
-hardlink path=usr/lib/git-core/git-fast-export target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-fast-export target=git
file path=usr/lib/git-core/git-fast-import
-hardlink path=usr/lib/git-core/git-fetch target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-fetch-pack target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-fetch target=git
+hardlink path=usr/lib/git-core/git-fetch-pack target=git
file path=usr/lib/git-core/git-filter-branch
-hardlink path=usr/lib/git-core/git-fmt-merge-msg target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-for-each-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-format-patch target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-fsck target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-fsck-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-gc target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-get-tar-commit-id target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-grep target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-fmt-merge-msg target=git
+hardlink path=usr/lib/git-core/git-for-each-ref target=git
+hardlink path=usr/lib/git-core/git-format-patch target=git
+hardlink path=usr/lib/git-core/git-fsck target=git
+hardlink path=usr/lib/git-core/git-fsck-objects target=git
+hardlink path=usr/lib/git-core/git-gc target=git
+hardlink path=usr/lib/git-core/git-get-tar-commit-id target=git
+hardlink path=usr/lib/git-core/git-grep target=git
file path=usr/lib/git-core/git-gui
file path=usr/lib/git-core/git-gui--askpass
-hardlink path=usr/lib/git-core/git-hash-object target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-help target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-hash-object target=git
+hardlink path=usr/lib/git-core/git-help target=git
file path=usr/lib/git-core/git-http-backend
file path=usr/lib/git-core/git-http-fetch
file path=usr/lib/git-core/git-http-push
file path=usr/lib/git-core/git-imap-send
-hardlink path=usr/lib/git-core/git-index-pack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-init target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-init-db target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-index-pack target=git
+hardlink path=usr/lib/git-core/git-init target=git
+hardlink path=usr/lib/git-core/git-init-db target=git
file path=usr/lib/git-core/git-instaweb
-hardlink path=usr/lib/git-core/git-log target=git-cherry-pick
-file path=usr/lib/git-core/git-lost-found
-hardlink path=usr/lib/git-core/git-ls-files target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-ls-remote target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-ls-tree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mailinfo target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mailsplit target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-base target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-file target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-index target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-interpret-trailers target=git
+hardlink path=usr/lib/git-core/git-log target=git
+hardlink path=usr/lib/git-core/git-ls-files target=git
+hardlink path=usr/lib/git-core/git-ls-remote target=git
+hardlink path=usr/lib/git-core/git-ls-tree target=git
+hardlink path=usr/lib/git-core/git-mailinfo target=git
+hardlink path=usr/lib/git-core/git-mailsplit target=git
+hardlink path=usr/lib/git-core/git-merge target=git
+hardlink path=usr/lib/git-core/git-merge-base target=git
+hardlink path=usr/lib/git-core/git-merge-file target=git
+hardlink path=usr/lib/git-core/git-merge-index target=git
file path=usr/lib/git-core/git-merge-octopus
file path=usr/lib/git-core/git-merge-one-file
-hardlink path=usr/lib/git-core/git-merge-ours target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-recursive target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-merge-ours target=git
+hardlink path=usr/lib/git-core/git-merge-recursive target=git
file path=usr/lib/git-core/git-merge-resolve
-hardlink path=usr/lib/git-core/git-merge-subtree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-merge-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-merge-subtree target=git
+hardlink path=usr/lib/git-core/git-merge-tree target=git
file path=usr/lib/git-core/git-mergetool
file path=usr/lib/git-core/git-mergetool--lib
-hardlink path=usr/lib/git-core/git-mktag target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mktree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-mv target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-name-rev target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-notes target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-pack-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-pack-redundant target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-pack-refs target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-mktag target=git
+hardlink path=usr/lib/git-core/git-mktree target=git
+hardlink path=usr/lib/git-core/git-mv target=git
+hardlink path=usr/lib/git-core/git-name-rev target=git
+hardlink path=usr/lib/git-core/git-notes target=git
+file path=usr/lib/git-core/git-p4
+hardlink path=usr/lib/git-core/git-pack-objects target=git
+hardlink path=usr/lib/git-core/git-pack-redundant target=git
+hardlink path=usr/lib/git-core/git-pack-refs target=git
file path=usr/lib/git-core/git-parse-remote
-hardlink path=usr/lib/git-core/git-patch-id target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-peek-remote target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-prune target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-prune-packed target=git-cherry-pick
-file path=usr/lib/git-core/git-pull
-hardlink path=usr/lib/git-core/git-push target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-patch-id target=git
+hardlink path=usr/lib/git-core/git-prune target=git
+hardlink path=usr/lib/git-core/git-prune-packed target=git
+hardlink path=usr/lib/git-core/git-pull target=git
+hardlink path=usr/lib/git-core/git-push target=git
file path=usr/lib/git-core/git-quiltimport
-hardlink path=usr/lib/git-core/git-read-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-read-tree target=git
file path=usr/lib/git-core/git-rebase
file path=usr/lib/git-core/git-rebase--am
file path=usr/lib/git-core/git-rebase--interactive
file path=usr/lib/git-core/git-rebase--merge
-hardlink path=usr/lib/git-core/git-receive-pack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-reflog target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-receive-pack target=git
+hardlink path=usr/lib/git-core/git-reflog target=git
file path=usr/lib/git-core/git-relink
-hardlink path=usr/lib/git-core/git-remote target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-remote-ext target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-remote-fd target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-remote target=git
+hardlink path=usr/lib/git-core/git-remote-ext target=git
+hardlink path=usr/lib/git-core/git-remote-fd target=git
hardlink path=usr/lib/git-core/git-remote-ftp target=git-remote-ftps
file path=usr/lib/git-core/git-remote-ftps
hardlink path=usr/lib/git-core/git-remote-http target=git-remote-ftps
hardlink path=usr/lib/git-core/git-remote-https target=git-remote-ftps
-file path=usr/lib/git-core/git-remote-testgit
-file path=usr/lib/git-core/git-repack
-hardlink path=usr/lib/git-core/git-replace target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-repo-config target=git-cherry-pick
+file path=usr/lib/git-core/git-remote-testsvn
+hardlink path=usr/lib/git-core/git-repack target=git
+hardlink path=usr/lib/git-core/git-replace target=git
file path=usr/lib/git-core/git-request-pull
-hardlink path=usr/lib/git-core/git-rerere target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-reset target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-rev-list target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-rev-parse target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-revert target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-rm target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-rerere target=git
+hardlink path=usr/lib/git-core/git-reset target=git
+hardlink path=usr/lib/git-core/git-rev-list target=git
+hardlink path=usr/lib/git-core/git-rev-parse target=git
+hardlink path=usr/lib/git-core/git-revert target=git
+hardlink path=usr/lib/git-core/git-rm target=git
file path=usr/lib/git-core/git-send-email
-hardlink path=usr/lib/git-core/git-send-pack target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-send-pack target=git
file path=usr/lib/git-core/git-sh-i18n
file path=usr/lib/git-core/git-sh-i18n--envsubst
file path=usr/lib/git-core/git-sh-setup
file path=usr/lib/git-core/git-shell
-hardlink path=usr/lib/git-core/git-shortlog target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-show target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-show-branch target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-shortlog target=git
+hardlink path=usr/lib/git-core/git-show target=git
+hardlink path=usr/lib/git-core/git-show-branch target=git
file path=usr/lib/git-core/git-show-index
-hardlink path=usr/lib/git-core/git-show-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-stage target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-show-ref target=git
+hardlink path=usr/lib/git-core/git-stage target=git
file path=usr/lib/git-core/git-stash
-hardlink path=usr/lib/git-core/git-status target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-stripspace target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-status target=git
+hardlink path=usr/lib/git-core/git-stripspace target=git
file path=usr/lib/git-core/git-submodule
+hardlink path=usr/lib/git-core/git-submodule--helper target=git
file path=usr/lib/git-core/git-svn
-hardlink path=usr/lib/git-core/git-symbolic-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-tag target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-tar-tree target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-unpack-file target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-unpack-objects target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-update-index target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-update-ref target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-update-server-info target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-upload-archive target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-symbolic-ref target=git
+hardlink path=usr/lib/git-core/git-tag target=git
+hardlink path=usr/lib/git-core/git-unpack-file target=git
+hardlink path=usr/lib/git-core/git-unpack-objects target=git
+hardlink path=usr/lib/git-core/git-update-index target=git
+hardlink path=usr/lib/git-core/git-update-ref target=git
+hardlink path=usr/lib/git-core/git-update-server-info target=git
+hardlink path=usr/lib/git-core/git-upload-archive target=git
file path=usr/lib/git-core/git-upload-pack
-hardlink path=usr/lib/git-core/git-var target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-verify-pack target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-verify-tag target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-var target=git
+hardlink path=usr/lib/git-core/git-verify-commit target=git
+hardlink path=usr/lib/git-core/git-verify-pack target=git
+hardlink path=usr/lib/git-core/git-verify-tag target=git
file path=usr/lib/git-core/git-web--browse
-hardlink path=usr/lib/git-core/git-whatchanged target=git-cherry-pick
-hardlink path=usr/lib/git-core/git-write-tree target=git-cherry-pick
+hardlink path=usr/lib/git-core/git-whatchanged target=git
+hardlink path=usr/lib/git-core/git-worktree target=git
+hardlink path=usr/lib/git-core/git-write-tree target=git
dir path=usr/lib/git-core/mergetools
file path=usr/lib/git-core/mergetools/araxis
+file path=usr/lib/git-core/mergetools/bc
file path=usr/lib/git-core/mergetools/bc3
-file path=usr/lib/git-core/mergetools/defaults
+file path=usr/lib/git-core/mergetools/codecompare
+file path=usr/lib/git-core/mergetools/deltawalker
+file path=usr/lib/git-core/mergetools/diffmerge
file path=usr/lib/git-core/mergetools/diffuse
file path=usr/lib/git-core/mergetools/ecmerge
file path=usr/lib/git-core/mergetools/emerge
+file path=usr/lib/git-core/mergetools/gvimdiff
+file path=usr/lib/git-core/mergetools/gvimdiff2
+file path=usr/lib/git-core/mergetools/gvimdiff3
file path=usr/lib/git-core/mergetools/kdiff3
file path=usr/lib/git-core/mergetools/kompare
file path=usr/lib/git-core/mergetools/meld
@@ -222,35 +239,47 @@
file path=usr/lib/git-core/mergetools/p4merge
file path=usr/lib/git-core/mergetools/tkdiff
file path=usr/lib/git-core/mergetools/tortoisemerge
-file path=usr/lib/git-core/mergetools/vim
+file path=usr/lib/git-core/mergetools/vimdiff
+file path=usr/lib/git-core/mergetools/vimdiff2
+file path=usr/lib/git-core/mergetools/vimdiff3
+file path=usr/lib/git-core/mergetools/winmerge
file path=usr/lib/git-core/mergetools/xxdiff
-dir path=usr/lib/python$(PYVER)
-dir path=usr/lib/python$(PYVER)/vendor-packages
-dir path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers-0.1.0-py$(PYVER).egg-info
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/__init__.pyc
-dir path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/__init__.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/exporter.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/exporter.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/git.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/git.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/importer.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/importer.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/non_local.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/non_local.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/repo.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/git/repo.pyc
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/util.py
-file path=usr/lib/python$(PYVER)/vendor-packages/git_remote_helpers/util.pyc
dir path=usr/perl5
+dir path=usr/perl5/$(PERL_VERSION)
+dir path=usr/perl5/$(PERL_VERSION)/man
+dir path=usr/perl5/$(PERL_VERSION)/man/man3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::I18N.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Editor.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Fetcher.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Memoize::YAML.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Prompt.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Ra.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Git::SVN::Utils.3
dir path=usr/perl5/vendor_perl
dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Error.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Git.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Git/.packlist
+# perl/Makefile.PL installs this file if and only if 'require Error' fails.
+# Thus if git is installed, it succeeds, and the file is not installed. So
+# ignore that and just pull from the source.
+file perl/private-Error.pm path=usr/perl5/vendor_perl/$(PERL_VERSION)/Error.pm
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/I18N.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/IndexInfo.pm
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Editor.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Fetcher.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/GlobSpec.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Log.pm
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Memoize
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Memoize/YAML.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Migration.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Prompt.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Ra.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/Git/SVN/Utils.pm
dir path=usr/share
dir path=usr/share/git-core
dir path=usr/share/git-core/templates
@@ -262,6 +291,7 @@
file path=usr/share/git-core/templates/hooks/post-update.sample
file path=usr/share/git-core/templates/hooks/pre-applypatch.sample
file path=usr/share/git-core/templates/hooks/pre-commit.sample
+file path=usr/share/git-core/templates/hooks/pre-push.sample
file path=usr/share/git-core/templates/hooks/pre-rebase.sample
file path=usr/share/git-core/templates/hooks/prepare-commit-msg.sample
file path=usr/share/git-core/templates/hooks/update.sample
@@ -296,6 +326,7 @@
file path=usr/share/git-gui/lib/merge.tcl
file path=usr/share/git-gui/lib/mergetool.tcl
dir path=usr/share/git-gui/lib/msgs
+file path=usr/share/git-gui/lib/msgs/bg.msg
file path=usr/share/git-gui/lib/msgs/de.msg
file path=usr/share/git-gui/lib/msgs/el.msg
file path=usr/share/git-gui/lib/msgs/fr.msg
@@ -306,6 +337,7 @@
file path=usr/share/git-gui/lib/msgs/pt_br.msg
file path=usr/share/git-gui/lib/msgs/ru.msg
file path=usr/share/git-gui/lib/msgs/sv.msg
+file path=usr/share/git-gui/lib/msgs/vi.msg
file path=usr/share/git-gui/lib/msgs/zh_cn.msg
file path=usr/share/git-gui/lib/option.tcl
file path=usr/share/git-gui/lib/remote.tcl
@@ -326,6 +358,8 @@
dir path=usr/share/gitk
dir path=usr/share/gitk/lib
dir path=usr/share/gitk/lib/msgs
+file path=usr/share/gitk/lib/msgs/bg.msg
+file path=usr/share/gitk/lib/msgs/ca.msg
file path=usr/share/gitk/lib/msgs/de.msg
file path=usr/share/gitk/lib/msgs/es.msg
file path=usr/share/gitk/lib/msgs/fr.msg
@@ -335,17 +369,27 @@
file path=usr/share/gitk/lib/msgs/pt_br.msg
file path=usr/share/gitk/lib/msgs/ru.msg
file path=usr/share/gitk/lib/msgs/sv.msg
+file path=usr/share/gitk/lib/msgs/vi.msg
dir path=usr/share/gitweb
-file path=usr/share/gitweb/gitweb.cgi
+file path=usr/share/gitweb/gitweb.cgi mode=0555
dir path=usr/share/gitweb/static
file path=usr/share/gitweb/static/git-favicon.png
file path=usr/share/gitweb/static/git-logo.png
file path=usr/share/gitweb/static/gitweb.css
file path=usr/share/gitweb/static/gitweb.js
dir path=usr/share/locale
-dir path=usr/share/locale/is
-dir path=usr/share/locale/is/LC_MESSAGES
+file path=usr/share/locale/bg/LC_MESSAGES/git.mo
+file path=usr/share/locale/ca/LC_MESSAGES/git.mo
+file path=usr/share/locale/de/LC_MESSAGES/git.mo
+file path=usr/share/locale/fr/LC_MESSAGES/git.mo
file path=usr/share/locale/is/LC_MESSAGES/git.mo
+file path=usr/share/locale/it/LC_MESSAGES/git.mo
+file path=usr/share/locale/ko/LC_MESSAGES/git.mo
+file path=usr/share/locale/pt_PT/LC_MESSAGES/git.mo
+file path=usr/share/locale/ru/LC_MESSAGES/git.mo
+file path=usr/share/locale/sv/LC_MESSAGES/git.mo
+file path=usr/share/locale/vi/LC_MESSAGES/git.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/git.mo
dir path=usr/share/man
dir path=usr/share/man/man1
file path=usr/share/man/man1/git-add.1
@@ -360,6 +404,8 @@
file path=usr/share/man/man1/git-bundle.1
file path=usr/share/man/man1/git-cat-file.1
file path=usr/share/man/man1/git-check-attr.1
+file path=usr/share/man/man1/git-check-ignore.1
+file path=usr/share/man/man1/git-check-mailmap.1
file path=usr/share/man/man1/git-check-ref-format.1
file path=usr/share/man/man1/git-checkout-index.1
file path=usr/share/man/man1/git-checkout.1
@@ -368,6 +414,7 @@
file path=usr/share/man/man1/git-citool.1
file path=usr/share/man/man1/git-clean.1
file path=usr/share/man/man1/git-clone.1
+file path=usr/share/man/man1/git-column.1
file path=usr/share/man/man1/git-commit-tree.1
file path=usr/share/man/man1/git-commit.1
file path=usr/share/man/man1/git-config.1
@@ -375,6 +422,7 @@
file path=usr/share/man/man1/git-credential-cache--daemon.1
file path=usr/share/man/man1/git-credential-cache.1
file path=usr/share/man/man1/git-credential-store.1
+file path=usr/share/man/man1/git-credential.1
file path=usr/share/man/man1/git-cvsexportcommit.1
file path=usr/share/man/man1/git-cvsimport.1
file path=usr/share/man/man1/git-cvsserver.1
@@ -409,8 +457,8 @@
file path=usr/share/man/man1/git-init-db.1
file path=usr/share/man/man1/git-init.1
file path=usr/share/man/man1/git-instaweb.1
+file path=usr/share/man/man1/git-interpret-trailers.1
file path=usr/share/man/man1/git-log.1
-file path=usr/share/man/man1/git-lost-found.1
file path=usr/share/man/man1/git-ls-files.1
file path=usr/share/man/man1/git-ls-remote.1
file path=usr/share/man/man1/git-ls-tree.1
@@ -435,7 +483,6 @@
file path=usr/share/man/man1/git-pack-refs.1
file path=usr/share/man/man1/git-parse-remote.1
file path=usr/share/man/man1/git-patch-id.1
-file path=usr/share/man/man1/git-peek-remote.1
file path=usr/share/man/man1/git-prune-packed.1
file path=usr/share/man/man1/git-prune.1
file path=usr/share/man/man1/git-pull.1
@@ -448,12 +495,10 @@
file path=usr/share/man/man1/git-relink.1
file path=usr/share/man/man1/git-remote-ext.1
file path=usr/share/man/man1/git-remote-fd.1
-file path=usr/share/man/man1/git-remote-helpers.1
file path=usr/share/man/man1/git-remote-testgit.1
file path=usr/share/man/man1/git-remote.1
file path=usr/share/man/man1/git-repack.1
file path=usr/share/man/man1/git-replace.1
-file path=usr/share/man/man1/git-repo-config.1
file path=usr/share/man/man1/git-request-pull.1
file path=usr/share/man/man1/git-rerere.1
file path=usr/share/man/man1/git-reset.1
@@ -480,7 +525,6 @@
file path=usr/share/man/man1/git-svn.1
file path=usr/share/man/man1/git-symbolic-ref.1
file path=usr/share/man/man1/git-tag.1
-file path=usr/share/man/man1/git-tar-tree.1
file path=usr/share/man/man1/git-unpack-file.1
file path=usr/share/man/man1/git-unpack-objects.1
file path=usr/share/man/man1/git-update-index.1
@@ -489,15 +533,19 @@
file path=usr/share/man/man1/git-upload-archive.1
file path=usr/share/man/man1/git-upload-pack.1
file path=usr/share/man/man1/git-var.1
+file path=usr/share/man/man1/git-verify-commit.1
file path=usr/share/man/man1/git-verify-pack.1
file path=usr/share/man/man1/git-verify-tag.1
file path=usr/share/man/man1/git-web--browse.1
file path=usr/share/man/man1/git-whatchanged.1
+file path=usr/share/man/man1/git-worktree.1
file path=usr/share/man/man1/git-write-tree.1
file path=usr/share/man/man1/git.1
file path=usr/share/man/man1/gitk.1
+file path=usr/share/man/man1/gitremote-helpers.1
file path=usr/share/man/man1/gitweb.1
dir path=usr/share/man/man4
+# Autogenerated symlinks to the Git man3 pages go here.
file path=usr/share/man/man4/gitattributes.4
file path=usr/share/man/man4/githooks.4
file path=usr/share/man/man4/gitignore.4
@@ -510,10 +558,12 @@
file path=usr/share/man/man5/gitcredentials.5
file path=usr/share/man/man5/gitcvs-migration.5
file path=usr/share/man/man5/gitdiffcore.5
+file path=usr/share/man/man5/giteveryday.5
file path=usr/share/man/man5/gitglossary.5
file path=usr/share/man/man5/gitnamespaces.5
file path=usr/share/man/man5/gitrevisions.5
file path=usr/share/man/man5/gittutorial-2.5
file path=usr/share/man/man5/gittutorial.5
file path=usr/share/man/man5/gitworkflows.5
+#
license git.license license=GPLv2