git-commit-vandalism

History

SZEDER Gábor e3e0b9378b bash prompt: combine 'git rev-parse' for detached head When describing a detached HEAD according to the $GIT_PS1_DESCRIBE environment variable fails, __git_ps1() now runs the '$(git rev-parse --short HEAD)' command substitution to get the abbreviated detached HEAD commit object name. This imposes the overhead of fork()ing a subshell and fork()+exec()ing a git process. Avoid this overhead by combining this command substitution with the "main" 'git rev-parse' execution for getting the path to the .git directory & co. This means that we'll look for the abbreviated commit object name even when it's not necessary, because we're on a branch or the detached HEAD can be described. It doesn't matter, however, because once 'git rev-parse' is up and running to fulfill all those other queries, the additional overhead of looking for the abbreviated commit object name is not measurable because it's lost in the noise. There is a caveat, however, when we are on an unborn branch, because in that case HEAD doesn't point to a valid commit, hence the query for the abbreviated commit object name fails. Therefore, '--short HEAD' must be the last options to 'git rev-parse' in order to get all the other necessary information for the prompt even on an unborn branch. Furthermore, in that case, and in that case only, 'git rev-parse' doesn't output the last line containing the abbreviated commit object name, obviously, so we have to take care to only parse it if 'git rev-parse' exited without any error. Although there are tests already excercising __git_ps1() on unborn branches, they all do so implicitly. Add a test that checks this explicitly. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>		2013-06-24 18:03:30 +02:00
..
buildsystems	msvc: Fix an "unrecognized option" linker warning	2010-01-22 16:15:14 -08:00
ciabot	Add checks to Python scripts for version dependencies.	2012-12-28 11:35:04 -08:00
completion	bash prompt: combine 'git rev-parse' for detached head	2013-06-24 18:03:30 +02:00
convert-objects	Documentation: use [verse] for SYNOPSIS sections	2011-07-06 14:26:26 -07:00
credential	credential-osxkeychain: support more protocols	2013-05-28 11:29:47 -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	contrib/examples/git-remote.perl: use a lowercase "usage:" string	2013-02-24 21:30:15 -08:00
fast-import	contrib/fast-import/import-zips.py: use spaces instead of tabs	2013-02-24 13:31:08 -08:00
git-jump	git-jump: ignore (custom) prefix in diff mode	2012-09-17 12:31:57 -07:00
git-shell-commands	Add sample commands for git-shell	2010-08-12 15:16:31 -07:00
gitview	Documentation: use [verse] for SYNOPSIS sections	2011-07-06 14:26:26 -07:00
hg-to-git	Add checks to Python scripts for version dependencies.	2012-12-28 11:35:04 -08:00
hooks	contrib/hooks/setgitperms.perl: use a lowercase "usage:" string	2013-02-24 13:31:09 -08:00
mw-to-git	Merge branch 'cm/remote-mediawiki-perlcritique'	2013-06-23 14:53:14 -07:00
p4import	Add checks to Python scripts for version dependencies.	2012-12-28 11:35:04 -08:00
persistent-https	Add persistent-https to contrib	2012-05-30 13:50:45 -07:00
remote-helpers	Merge branch 'fc/remote-bzr'	2013-06-11 13:30:26 -07:00
stats	contrib: update stats/mailmap script	2012-12-12 11:09:11 -08:00
subtree	Merge branch 'dm/unbash-subtree'	2013-06-05 14:56:24 -07:00
svn-fe	svn-fe: allow svnrdump_sim.py to run with Python 3	2013-01-24 19:32:35 -08:00
thunderbird-patch-inline	contrib/thunderbird-patch-inline: do not require bash to run the script	2011-03-30 12:29:39 -07:00
vim	contrib/vim: simplify instructions for old vim support	2013-01-10 14:58:54 -08:00
workdir	prefer test -h over test -L in shell scripts	2010-09-27 10:48:23 -07:00
git-resurrect.sh	request-pull: protect against OPTIONS_KEEPDASHDASH from environment	2010-05-01 11:02:21 -07:00
README
remotes2config.sh
rerere-train.sh	contrib/rerere-train: use installed git-sh-setup	2012-04-30 12:50:38 -07:00

README

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