1
0
mirror of https://github.com/git/git.git synced 2024-11-18 21:23:51 +01:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Jonathan Nieder 8a55caa8a3 ident: check /etc/mailname if email is unknown
Before falling back to gethostname(), check /etc/mailname if
GIT_AUTHOR_EMAIL is not set in the environment or through config
files.  Only fall back if /etc/mailname cannot be opened or read.

The /etc/mailname convention comes from Debian policy section 11.6
("mail transport, delivery and user agents"), though maybe it could be
useful sometimes on other machines, too.  The lack of this support was
noticed by various people in different ways:

 - Ian observed that git was choosing the address
   'ian@anarres.relativity.greenend.org.uk' rather than
   'ian@davenant.greenend.org.uk' as it should have done.

 - Jonathan noticed that operations like "git commit" were needlessly
   slow when using a resolver that was slow to handle reverse DNS
   lookups.

Alas, after this patch, if /etc/mailname is set up and the [user] name
and email configuration aren't, the committer email will not provide a
charming reminder of which machine commits were made on any more.  But
I think it's worth it.

Mechanics: the functionality of reading mailname goes in its own
function, so people who care about other distros can easily add an
implementation to a similar location without making copy_email() too
long and losing clarity.  While at it, we split out the fallback
default logic that does gethostname(), too (rearranging it a little
and adding a check for errors from gethostname while at it).

Based on a patch by Gerrit Pape <pape@smarden.org>.

Requested-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-10-03 12:00:44 -07:00
block-sha1
builtin plug a few coverity-spotted leaks 2011-06-20 14:27:36 -07:00
compat compat/fnmatch/fnmatch.c: give a fall-back definition for NULL 2011-05-26 09:25:47 -07:00
contrib Merge branch 'maint' 2011-06-26 12:09:11 -07:00
Documentation ident: check /etc/mailname if email is unknown 2011-10-03 12:00:44 -07:00
git_remote_helpers
git-gui
gitk-git
gitweb Merge branch 'maint' 2011-06-21 14:56:59 -07:00
perl
po
ppc
t Merge branch 'mk/grep-pcre' 2011-06-20 14:49:44 -07:00
templates
vcs-svn Merge branch 'rj/sparse' 2011-04-27 11:36:42 -07:00
xdiff
.gitattributes
.gitignore Merge branch 'jn/gitweb-js' 2011-05-26 10:31:57 -07:00
.mailmap
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c sparse: Fix some "symbol not declared" warnings 2011-04-22 10:04:27 -07:00
attr.h
base85.c
bisect.c bisect: refactor sha1_array into a generic sha1 list 2011-05-19 20:02:10 -07:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jk/maint-config-alias-fix' into maint 2011-06-01 14:05:22 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c
command-list.txt
commit.c
commit.h Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
config.c Merge branch 'jk/maint-config-alias-fix' into maint 2011-06-01 14:05:22 -07:00
config.mak.in Merge branch 'kk/maint-prefix-in-config-mak' into maint 2011-06-01 14:02:39 -07:00
configure.ac configure: Check for libpcre 2011-05-09 16:29:46 -07:00
connect.c Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4 2011-05-26 10:28:10 -07:00
convert.c convert: make it harder to screw up adding a conversion attribute 2011-05-09 14:59:09 -07:00
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c date: avoid "X years, 12 months" in relative dates 2011-04-20 19:23:16 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'jk/diff-not-so-quick' 2011-06-06 11:40:14 -07:00
diff-no-index.c
diff.c Merge branch 'jk/diff-not-so-quick' 2011-06-06 11:40:14 -07:00
diff.h Merge branch 'jk/diff-not-so-quick' 2011-06-06 11:40:14 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diffcore-rename.c: avoid set-but-not-used warning 2011-06-01 13:54:17 -07:00
diffcore.h
dir.c Merge branch 'nd/struct-pathspec' 2011-05-06 10:50:06 -07:00
dir.h Merge branch 'nd/maint-setup' 2011-05-02 15:58:30 -07:00
editor.c
entry.c
environment.c Merge branch 'jc/replacing' 2011-05-19 20:37:21 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c fast-import: fix option parser for no-arg options 2011-05-05 21:21:24 -07:00
fetch-pack.h
fixup-builtins
fsck.c Merge branch 'jm/maint-misc-fix' into maint 2011-05-30 00:09:41 -07:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl add -i: ignore terminal escape sequences 2011-05-17 20:44:17 -07:00
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'jc/magic-pathspec' 2011-05-23 09:58:35 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint 2011-05-13 10:44:54 -07:00
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh Merge branch 'jk/merge-one-file-working-tree' into maint 2011-05-13 10:44:19 -07:00
git-merge-resolve.sh
git-mergetool--lib.sh Pass empty file to p4merge where no base is suitable. 2011-05-01 15:56:05 -07:00
git-mergetool.sh
git-parse-remote.sh Merge branch 'mz/rebase' 2011-04-28 14:11:39 -07:00
git-pull.sh Merge branch 'mz/rebase' 2011-04-28 14:11:39 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh rebase: write a reflog entry when finishing 2011-05-27 15:52:03 -07:00
git-rebase--merge.sh
git-rebase.sh rebase: write a reflog entry when finishing 2011-05-27 15:52:03 -07:00
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh
git-send-email.perl git-send-email: fix missing space in error message 2011-04-29 11:34:32 -07:00
git-sh-i18n.sh git-sh-i18n.sh: add GIT_GETTEXT_POISON support 2011-05-14 20:29:11 -07:00
git-sh-setup.sh require-work-tree wants more than what its name says 2011-05-24 11:34:40 -07:00
git-stash.sh Merge branch 'jk/maint-stash-oob' into maint 2011-05-04 14:58:42 -07:00
git-submodule.sh Merge branch 'maint' 2011-05-30 00:09:55 -07:00
git-svn.perl Merge branch 'maint' 2011-05-20 18:50:29 -07:00
GIT-VERSION-GEN Git 1.7.6 2011-06-26 12:41:16 -07:00
git-web--browse.sh
git.c Merge branch 'jk/maint-config-alias-fix' into maint 2011-06-01 14:05:22 -07:00
git.spec.in
graph.c
graph.h
grep.c git-grep: Learn PCRE 2011-05-09 16:29:33 -07:00
grep.h git-grep: Learn PCRE 2011-05-09 16:29:33 -07:00
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c http-push: refactor curl_easy_setup madness 2011-05-04 13:30:28 -07:00
http-walker.c http: make curl callbacks match contracts from curl header 2011-05-04 13:30:28 -07:00
http.c Merge branch 'sp/maint-clear-postfields' into maint 2011-05-04 14:58:56 -07:00
http.h http: make curl callbacks match contracts from curl header 2011-05-04 13:30:28 -07:00
ident.c ident: check /etc/mailname if email is unknown 2011-10-03 12:00:44 -07:00
imap-send.c
INSTALL
levenshtein.c
levenshtein.h
LGPL-2.1 provide a copy of the LGPLv2.1 2011-05-19 18:23:17 -07:00
list-objects.c Merge branch 'nd/struct-pathspec' 2011-05-06 10:50:06 -07:00
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'mk/grep-pcre' 2011-05-30 00:00:07 -07:00
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c Merge branch 'jc/rename-degrade-cc-to-c' into maint 2011-05-31 12:00:02 -07:00
merge-recursive.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c index_fd(): turn write_object and format_check arguments into one flag 2011-05-09 11:58:19 -07:00
notes-merge.h
notes.c
notes.h
object.c read_sha1_file(): get rid of read_sha1_file_repl() madness 2011-05-15 15:23:33 -07:00
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c index_fd(): turn write_object and format_check arguments into one flag 2011-05-09 11:58:19 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c Fix typo: existant->existent 2011-06-16 10:33:50 -07:00
refs.h
RelNotes Start 1.7.5.4 draft release notes 2011-05-31 12:06:40 -07:00
remote-curl.c plug a few coverity-spotted leaks 2011-06-20 14:27:36 -07:00
remote.c
remote.h
replace_object.c inline lookup_replace_object() calls 2011-05-15 15:23:33 -07:00
rerere.c Merge branch 'maint' 2011-05-30 00:09:55 -07:00
rerere.h rerere: libify rerere_clear() and rerere_gc() 2011-05-08 12:55:34 -07:00
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/notes-batch-removal' 2011-05-29 23:51:26 -07:00
revision.h Merge branch 'jk/format-patch-am' 2011-05-31 12:19:11 -07:00
run-command.c run-command: handle short writes and EINTR in die_child 2011-04-20 10:09:26 -07:00
run-command.h
send-pack.h
server-info.c
setup.c Merge branch 'maint' 2011-05-30 00:09:55 -07:00
sh-i18n--envsubst.c Merge branch 'ab/i18n-scripts-basic' 2011-06-17 11:40:32 -07:00
sha1_file.c Merge branch 'jc/bigfile' 2011-05-25 16:23:26 -07:00
sha1_name.c Merge branch 'jc/magic-pathspec' 2011-05-23 09:58:35 -07:00
sha1-array.c receive-pack: eliminate duplicate .have refs 2011-05-19 20:02:31 -07:00
sha1-array.h receive-pack: eliminate duplicate .have refs 2011-05-19 20:02:31 -07:00
sha1-lookup.c
sha1-lookup.h
shallow.c
shell.c shell: add missing initialization of argv0_path 2011-05-05 09:32:28 -07:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c Merge branch 'ef/maint-strbuf-init' 2011-04-27 11:36:43 -07:00
strbuf.h strbuf: clarify assertion in strbuf_setlen() 2011-04-27 10:52:15 -07:00
string-list.c
string-list.h
submodule.c Submodules: Don't parse .gitmodules when it contains, merge conflicts 2011-05-14 10:57:56 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mktemp.c
test-obj-pool.c
test-parse-options.c
test-path-utils.c
test-run-command.c tests: check error message from run_command 2011-04-20 10:08:54 -07:00
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-pool.c
test-subprocess.c
test-svn-fe.c
test-treap.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c Merge branch 'maint' 2011-05-30 00:09:55 -07:00
transport.h refactor refs_from_alternate_cb to allow passing extra data 2011-05-19 20:01:10 -07:00
tree-diff.c Merge branch 'jk/diff-not-so-quick' 2011-06-06 11:40:14 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c unpack-trees: add the dry_run flag to unpack_trees_options 2011-05-25 14:32:02 -07:00
unpack-trees.h unpack-trees: add the dry_run flag to unpack_trees_options 2011-05-25 14:32:02 -07:00
upload-pack.c Merge branch 'jk/maint-upload-pack-shallow' into maint 2011-05-04 14:58:13 -07:00
url.c
url.h
usage.c
userdiff.c userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters 2011-05-23 11:39:13 -07:00
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c read_in_full: always report errors 2011-05-26 13:54:18 -07:00
write_or_die.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c add, merge, diff: do not use strcasecmp to compare config variable names 2011-05-14 18:53:39 -07:00
xdiff-interface.h
zlib.c

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe
to the list, send an email with just "subscribe git" in the body to
majordomo@vger.kernel.org. The mailing list archives are available at
http://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.