1
0
mirror of https://github.com/git/git.git synced 2024-10-21 03:28:41 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Junio C Hamano 584c43567b am: allow individual e-mail files as input
We traditionally allowed a mbox file or a directory name of a maildir (but
never an individual file inside a maildir) to be given to "git am".  Even
though an individual file in a maildir (or more generally, a piece of
RFC2822 e-mail) is not a mbox file, it contains enough information to
create a commit out of it, so there is no reason to reject one.  Running
mailsplit on such a file feels stupid, but it does not hurt.

This builds on top of a5a6755 (git-am foreign patch support: introduce
patch_format, 2009-05-27) that introduced mailbox format detection.  The
codepath to deal with a mbox requires it to begin with "From " line and
also allows it to begin with "From: ", but a random piece of e-mail can
and often do begin with any valid RFC2822 header lines.

Instead of checking the first line, we extract all the lines up to the
first empty line, and make sure they look like e-mail headers.

A test is added to t4150 to demonstrate this feature.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-10 16:54:23 -07:00
arm
compat MinGW: truncate exit()'s argument to lowest 8 bits 2009-07-05 12:16:26 -07:00
contrib Merge branch 'maint-1.6.3' into maint 2009-08-05 12:37:24 -07:00
Documentation Documentation: git submodule: add missing options to synopsis 2009-08-05 12:36:38 -07:00
git-gui
gitk-git
gitweb gitweb/README: Document $base_url 2009-08-05 12:36:38 -07:00
mozilla-sha1
perl
ppc
t am: allow individual e-mail files as input 2009-08-10 16:54:23 -07:00
templates
xdiff refactor: use bitsizeof() instead of 8 * sizeof() 2009-07-22 21:57:41 -07:00
.gitattributes
.gitignore
.mailmap
abspath.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c attr: plug minor memory leak 2009-06-30 16:12:24 -07:00
attr.h
base85.c
bisect.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
bisect.h
blob.c
blob.h
branch.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
branch.h
builtin-add.c Add 'fill_directory()' helper function for directory traversal 2009-07-09 01:11:26 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-archive.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-bisect--helper.c
builtin-blame.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-branch.c Merge branch 'maint' 2009-07-24 09:27:09 -07:00
builtin-bundle.c
builtin-cat-file.c
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-checkout.c
builtin-clean.c Add 'fill_directory()' helper function for directory traversal 2009-07-09 01:11:26 -07:00
builtin-clone.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-commit-tree.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-commit.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-config.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-count-objects.c
builtin-describe.c
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-fast-export.c Merge branch 'en/fast-export' 2009-07-26 11:23:52 -07:00
builtin-fetch--tool.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-fetch-pack.c
builtin-fetch.c quickfetch(): Prevent overflow of the rev-list command line 2009-07-10 23:53:17 -07:00
builtin-fmt-merge-msg.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-for-each-ref.c
builtin-fsck.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-gc.c
builtin-grep.c Merge branch 'rs/grep-p' 2009-07-09 00:59:58 -07:00
builtin-help.c
builtin-http-fetch.c
builtin-init-db.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-log.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-ls-files.c Add 'fill_directory()' helper function for directory traversal 2009-07-09 01:11:26 -07:00
builtin-ls-remote.c
builtin-ls-tree.c
builtin-mailinfo.c Revert "mailinfo: Remove only one set of square brackets" 2009-07-15 15:10:06 -07:00
builtin-mailsplit.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-merge-base.c
builtin-merge-file.c
builtin-merge-ours.c
builtin-merge-recursive.c
builtin-merge.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-mktree.c
builtin-mv.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-name-rev.c
builtin-pack-objects.c Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c
builtin-push.c push: do not give big warning when no preference is configured 2009-07-18 17:20:52 -07:00
builtin-read-tree.c
builtin-receive-pack.c
builtin-reflog.c Better usage string for reflog. 2009-08-05 09:45:00 -07:00
builtin-remote.c Merge branch 'cf/maint-remote-uploadpack-useconfig-fix' 2009-07-01 19:40:54 -07:00
builtin-rerere.c
builtin-reset.c
builtin-rev-list.c
builtin-rev-parse.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-revert.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-rm.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
builtin-send-pack.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-shortlog.c
builtin-show-branch.c
builtin-show-ref.c
builtin-stripspace.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-symbolic-ref.c
builtin-tag.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-tar-tree.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
builtin-unpack-objects.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
builtin-update-index.c
builtin-update-ref.c
builtin-upload-archive.c
builtin-verify-pack.c Merge branch 'maint-1.6.1' into maint-1.6.2 2009-08-07 20:44:09 -07:00
builtin-verify-tag.c
builtin-write-tree.c
builtin.h
bundle.c
bundle.h
cache-tree.c Improve on the 'invalid object' error message at commit time 2009-07-14 13:50:33 -07:00
cache-tree.h
cache.h Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c Merge branch 'maint' 2009-07-22 21:56:46 -07:00
command-list.txt
commit.c Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
commit.h
config.c Merge branch 'maint-1.6.3' into maint 2009-08-05 12:37:24 -07:00
config.mak.in configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests 2009-07-22 21:56:51 -07:00
configure.ac configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing 2009-07-22 21:57:41 -07:00
connect.c
convert.c
copy.c
COPYING
csum-file.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
csum-file.h
ctype.c
daemon.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'rs/grep-p' 2009-07-09 00:59:58 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Avoid using 'lstat()' to figure out directories 2009-07-09 20:05:19 -07:00
dir.h Simplify read_directory[_recursive]() arguments 2009-07-09 01:11:28 -07:00
editor.c
entry.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
environment.c Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
fetch-pack.h
fixup-builtins
fsck.c Allow the Unix epoch to be a valid commit date 2009-07-06 09:36:16 -07:00
fsck.h
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh am: allow individual e-mail files as input 2009-08-10 16:54:23 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h janitor: add DIV_ROUND_UP and use it. 2009-07-22 21:57:41 -07:00
git-cvsexportcommit.perl Avoid generating a warning if $fullname{$file} is undefined 2009-07-06 09:36:43 -07:00
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh Trivial path quoting fixes in git-instaweb 2009-07-26 11:27:27 -07:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--interactive.sh Fix rebase -p --onto 2009-07-22 11:15:06 -07:00
git-rebase.sh Merge branch 'sb/quiet-porcelains' 2009-07-01 19:40:50 -07:00
git-relink.perl
git-repack.sh Merge branch 'js/maint-graft-unhide-true-parents' 2009-07-25 00:45:03 -07:00
git-request-pull.sh request-pull: allow ls-remote to notice remote.$nickname.uploadpack 2009-07-28 23:31:38 -07:00
git-send-email.perl Merge branch 'maint-1.6.3' into maint 2009-08-05 12:37:24 -07:00
git-sh-setup.sh
git-stash.sh git stash: modernize use of "dashed" git-XXX calls 2009-07-22 21:57:41 -07:00
git-submodule.sh Merge branch 'sb/quiet-porcelains' 2009-07-01 19:40:50 -07:00
git-svn.perl git svn: make minimize URL more reliable over http(s) 2009-07-25 13:37:02 -07:00
GIT-VERSION-GEN GIT 1.6.4 2009-07-29 00:32:42 -07:00
git-web--browse.sh
git.c Merge branch 'js/run-command-updates' (early part) 2009-07-09 00:59:32 -07:00
git.spec.in
graph.c janitor: use NULL and not 0 for pointers. 2009-07-22 21:57:41 -07:00
graph.h
grep.c grep: simplify -p output 2009-07-02 21:36:42 -07:00
grep.h grep -p: support user defined regular expressions 2009-07-01 19:16:50 -07:00
hash-object.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
hash.c
hash.h
help.c janitor: add DIV_ROUND_UP and use it. 2009-07-22 21:57:41 -07:00
help.h
http-push.c http-push: fix xml_entities() string parsing overrun 2009-07-06 09:36:08 -07:00
http-walker.c
http.c Merge branch 'ml/http' 2009-07-09 01:00:36 -07:00
http.h
ident.c
imap-send.c
index-pack.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
INSTALL
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
ll-merge.h
lockfile.c
log-tree.c log-tree: fix confusing comment 2009-07-01 11:16:54 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'maint' 2009-07-24 09:27:09 -07:00
match-trees.c
merge-file.c
merge-index.c
merge-recursive.c Merge branch 'tr/die_errno' 2009-07-06 09:39:46 -07:00
merge-recursive.h
merge-tree.c
mktag.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
name-hash.c
object.c
object.h
pack-check.c
pack-redundant.c
pack-refs.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack-refs.h
pack-revindex.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
pack-revindex.h
pack-write.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pack.h
pager.c
parse-options.c
parse-options.h
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
pkt-line.h
preload-index.c janitor: add DIV_ROUND_UP and use it. 2009-07-22 21:57:41 -07:00
pretty.c
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'maint' 2009-07-24 09:27:09 -07:00
refs.h
RelNotes GIT 1.6.3.4 2009-07-28 23:59:30 -07:00
remote.c Merge branch 'cb/maint-fetch-refspec-wo-dst' 2009-07-06 09:39:38 -07:00
remote.h
rerere.c
rerere.h
revision.c Make 'git show' more useful 2009-07-14 13:50:29 -07:00
revision.h git log: add '--merges' flag to match '--no-merges' 2009-06-29 12:32:51 -07:00
run-command.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
run-command.h
send-pack.h
server-info.c
setup.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
sha1_file.c refactor: use bitsizeof() instead of 8 * sizeof() 2009-07-22 21:57:41 -07:00
sha1_name.c sha1_name.c: avoid unnecessary strbuf_release 2009-07-16 15:09:21 -07:00
sha1-lookup.c
sha1-lookup.h
shallow.c
shell.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
string-list.c
string-list.h
symlinks.c Export thread-safe version of 'has_symlink_leading_path()' 2009-07-09 20:05:19 -07:00
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-match-trees.c
test-parse-options.c
test-path-utils.c
test-sha1.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
test-sha1.sh
test-sigchain.c
thread-utils.c
thread-utils.h
trace.c
transport.c Merge branch 'ld/push-porcelain-output-format' 2009-07-09 01:07:54 -07:00
transport.h add --porcelain option to git-push 2009-06-27 22:26:58 -07:00
tree-diff.c Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory' 2009-07-01 19:40:47 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-file.c Use die_errno() instead of die() when checking syscalls 2009-06-27 11:14:53 -07:00
unpack-trees.c Merge branch 'maint' 2009-07-18 16:57:47 -07:00
unpack-trees.h
update-server-info.c
upload-pack.c
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
var.c
walker.c janitor: useless checks before free 2009-07-22 21:57:41 -07:00
walker.h
wrapper.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
write_or_die.c Convert existing die(..., strerror(errno)) to die_errno() 2009-06-27 11:14:53 -07:00
ws.c Fix severe breakage in "git-apply --whitespace=fix" 2009-07-25 01:29:20 -07:00
wt-status.c Add 'fill_directory()' helper function for directory traversal 2009-07-09 01:11:26 -07:00
wt-status.h
xdiff-interface.c userdiff: add xdiff_clear_find_func() 2009-07-01 19:16:37 -07:00
xdiff-interface.h userdiff: add xdiff_clear_find_func() 2009-07-01 19:16:37 -07:00

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

	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.or.cz/
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.