1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-09 02:33:11 +01:00
git/contrib
Jens Lehmann cf41982806 submodule: add 'deinit' command
With "git submodule init" the user is able to tell git he cares about one
or more submodules and wants to have it populated on the next call to "git
submodule update". But currently there is no easy way he could tell git he
does not care about a submodule anymore and wants to get rid of his local
work tree (except he knows a lot about submodule internals and removes the
"submodule.$name.url" setting from .git/config together with the work tree
himself).

Help those users by providing a 'deinit' command. This removes the
whole submodule.<name> section from .git/config (either for the given
submodule(s) or for all those which have been initialized if '.' is used)
together with their work tree. Fail if the current work tree contains
modifications (unless forced), but don't complain when either the work
tree is already removed or no settings are found in .git/config.

Add tests and link the man pages of "git submodule deinit" and "git rm"
to assist the user in deciding whether removing or unregistering the
submodule is the right thing to do for him. Also add the deinit subcommand
to the completion list.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-04 14:48:02 -08:00
..
blameview
buildsystems
ciabot Make the ciabot scripts completely self-configuring in the normal case. 2012-08-23 20:58:24 -07:00
completion submodule: add 'deinit' command 2013-03-04 14:48:02 -08:00
continuous
convert-objects
credential Merge branch 'ph/credential-gnome-keyring' 2012-09-10 15:42:30 -07:00
diff-highlight diff-highlight: document some non-optimal cases 2012-02-13 15:57:07 -08:00
diffall contrib/diffall: fix cleanup trap on Windows 2012-03-14 15:22:38 -07:00
emacs emacs: make 'git-status' work with separate git dirs 2012-11-26 09:34:28 -08:00
examples Merge branch 'jc/merge-bases' 2012-09-11 11:36:05 -07:00
fast-import git-p4: move to toplevel 2012-04-09 14:59:40 -07:00
git-jump git-jump: ignore (custom) prefix in diff mode 2012-09-17 12:31:57 -07:00
git-shell-commands
gitview
hg-to-git
hooks Fix spelling error in post-receive-email hook 2012-10-13 21:50:14 -07:00
mw-to-git git-remote-mediawiki: escape ", \, and LF in file names 2012-11-29 11:16:33 -08:00
p4import
patches
persistent-https Add persistent-https to contrib 2012-05-30 13:50:45 -07:00
remote-helpers remote-hg: fix for older versions of python 2012-11-27 18:04:00 -08:00
stats
subtree Fix git-subtree install instructions 2012-04-09 22:26:19 -05:00
svn-fe Add a svnrdump-simulator replaying a dump file for testing 2012-10-07 14:10:17 -07:00
thunderbird-patch-inline
vim
workdir
git-resurrect.sh
README
remotes2config.sh
rerere-train.sh contrib/rerere-train: use installed git-sh-setup 2012-04-30 12:50:38 -07:00

Contributed Software

Although these pieces are available as part of the official git
source tree, they are in somewhat different status.  The
intention is to keep interesting tools around git here, maybe
even experimental ones, to give users an easier access to them,
and to give tools wider exposure, so that they can be improved
faster.

I am not expecting to touch these myself that much.  As far as
my day-to-day operation is concerned, these subdirectories are
owned by their respective primary authors.  I am willing to help
if users of these components and the contrib/ subtree "owners"
have technical/design issues to resolve, but the initiative to
fix and/or enhance things _must_ be on the side of the subtree
owners.  IOW, I won't be actively looking for bugs and rooms for
enhancements in them as the git maintainer -- I may only do so
just as one of the users when I want to scratch my own itch.  If
you have patches to things in contrib/ area, the patch should be
first sent to the primary author, and then the primary author
should ack and forward it to me (git pull request is nicer).
This is the same way as how I have been treating gitk, and to a
lesser degree various foreign SCM interfaces, so you know the
drill.

I expect that things that start their life in the contrib/ area
to graduate out of contrib/ once they mature, either by becoming
projects on their own, or moving to the toplevel directory.  On
the other hand, I expect I'll be proposing removal of disused
and inactive ones from time to time.

If you have new things to add to this area, please first propose
it on the git mailing list, and after a list discussion proves
there are some general interests (it does not have to be a
list-wide consensus for a tool targeted to a relatively narrow
audience -- for example I do not work with projects whose
upstream is svn, so I have no use for git-svn myself, but it is
of general interest for people who need to interoperate with SVN
repositories in a way git-svn works better than git-svnimport),
submit a patch to create a subdirectory of contrib/ and put your
stuff there.

-jc