1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 02:03:12 +01:00
Find a file
Jeff King dd0d388c44 logmsg_reencode: never return NULL
The logmsg_reencode function will return the reencoded
commit buffer, or NULL if reencoding failed or no reencoding
was necessary. Since every caller then ends up checking for NULL
and just using the commit's original buffer, anyway, we can
be a bit more helpful and just return that buffer when we
would have returned NULL.

Since the resulting string may or may not need to be freed,
we introduce a logmsg_free, which checks whether the buffer
came from the commit object or not (callers either
implemented the same check already, or kept two separate
pointers, one to mark the buffer to be used, and one for the
to-be-freed string).

Pushing this logic into logmsg_* simplifies the callers, and
will let future patches lazily load the commit buffer in a
single place.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-26 13:28:21 -08:00
block-sha1
builtin logmsg_reencode: never return NULL 2013-01-26 13:28:21 -08:00
compat Merge branch 'nd/wildmatch' 2013-01-10 13:47:20 -08:00
contrib Merge branch 'ch/add-auto-submitted-in-sample-post-receive-email' 2013-01-23 21:19:19 -08:00
Documentation Update draft release notes to 1.8.2 2013-01-25 12:52:55 -08:00
git-gui git-gui 0.17.0 2012-10-17 15:55:46 -07:00
git_remote_helpers Merge branch 'er/python-version-requirements' 2013-01-09 08:25:48 -08:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2013-01-23 08:35:03 -08:00
gitweb Merge branch 'os/gitweb-highlight-uncaptured' into maint 2013-01-11 16:48:30 -08:00
mergetools mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder 2012-12-26 18:13:15 -08:00
perl git-svn: cleanup sprintf usage for uppercasing hex 2013-01-24 10:21:23 +00:00
po l10n: de.po: address the user formally 2013-01-07 18:33:35 +01:00
ppc
t Merge branch 'for-junio' of git://bogomips.org/git-svn 2013-01-25 12:53:31 -08:00
templates Add sample pre-push hook script 2013-01-18 11:13:22 -08:00
vcs-svn remote-svn: add incremental import 2012-10-07 14:10:17 -07:00
xdiff
.gitattributes
.gitignore Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
.mailmap .mailmap: normalize emails for Linus Torvalds 2012-12-12 11:09:11 -08:00
abspath.c Introduce new function real_path_if_valid() 2012-10-29 02:34:58 -04:00
aclocal.m4
advice.c push: allow already-exists advice to be disabled 2012-12-03 08:04:09 -08:00
advice.h push: allow already-exists advice to be disabled 2012-12-03 08:04:09 -08:00
alias.c
alloc.c
archive-tar.c Merge branch 'rs/leave-base-name-in-name-field-of-tar' into maint 2013-01-14 07:34:12 -08:00
archive-zip.c Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maint 2013-01-20 17:22:27 -08:00
archive.c Add directory pattern matching to attributes 2012-12-17 22:07:23 -08:00
archive.h
argv-array.c Merge branch 'fa/remote-svn' 2012-10-25 06:42:02 -04:00
argv-array.h Merge branch 'fa/remote-svn' 2012-10-25 06:42:02 -04:00
attr.c Merge branch 'nd/fix-directory-attrs-off-by-one' 2013-01-22 09:34:29 -08:00
attr.h
base85.c
bisect.c Move estimate_bisect_steps to libgit.a 2012-10-29 03:08:30 -04:00
bisect.h Move print_commit_list to libgit.a 2012-10-29 03:08:30 -04:00
blob.c
blob.h
branch.c
branch.h
builtin.h Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c cache-tree: invalidate i-t-a paths after generating trees 2012-12-15 23:04:22 -08:00
cache-tree.h cache-tree: fix writing cache-tree when CE_REMOVE is present 2012-12-15 23:04:22 -08:00
cache.h Merge branch 'jk/suppress-clang-warning' 2013-01-23 21:19:00 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
commit.c Move print_commit_list to libgit.a 2012-10-29 03:08:30 -04:00
commit.h logmsg_reencode: never return NULL 2013-01-26 13:28:21 -08:00
config.c Merge branch 'jn/warn-on-inaccessible-loosen' into maint 2013-01-11 16:47:07 -08:00
config.mak.in Makefile: whitespace style fixes in macro definitions 2012-12-10 08:35:56 -08:00
config.mak.uname Makefile: hoist uname autodetection to config.mak.uname 2013-01-03 14:15:17 -08:00
configure.ac Merge branch 'mh/pthreads-autoconf' into maint 2013-01-10 14:04:26 -08:00
connect.c
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c ctype: support iscntrl, ispunct, isxdigit and isprint 2012-10-15 14:58:16 -07:00
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jc/blame-no-follow' 2013-01-14 08:15:51 -08:00
diff.h Move setup_diff_pager to libgit.a 2012-10-29 03:08:30 -04:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c pickaxe: use textconv for -S counting 2012-10-28 08:48:17 -04:00
diffcore-rename.c
diffcore.h
dir.c Merge branch 'nd/retire-fnmatch' 2013-01-25 12:34:55 -08:00
dir.h Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
editor.c run-command: encode signal death as a positive integer 2013-01-06 11:09:18 -08:00
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c Merge branch 'mk/qnx' 2013-01-03 10:28:33 -08:00
fetch-pack.h
fixup-builtins
fmt-merge-msg.h
fsck.c fsck: warn about ".git" in trees 2012-11-28 13:52:54 -08:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'nd/retire-fnmatch' 2013-01-25 12:34:55 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: work around perl tzset issue 2012-11-04 08:02:41 -05:00
git-cvsserver.perl cvsserver: support -r and sticky tags for most operations 2012-10-16 16:17:54 -07:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: use git-sh-setup's ident parsing functions 2012-10-18 15:43:49 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh Merge branch 'da/mergetool-custom' 2012-10-01 12:58:57 -07:00
git-mergetool.sh
git-p4.py Merge branch 'pw/p4-branch-fixes' 2013-01-21 20:15:44 -08:00
git-parse-remote.sh push/pull: adjust missing upstream help text to changed interface 2012-11-08 11:32:38 -05:00
git-pull.sh git-pull: Avoid merge-base on detached head 2012-10-25 05:32:11 -04:00
git-quiltimport.sh
git-rebase--am.sh rebase: Handle cases where format-patch fails 2012-10-11 11:54:49 -07:00
git-rebase--interactive.sh Merge branch 'ph/rebase-preserve-all-merges' 2013-01-21 20:15:15 -08:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit remote-testgit: implement the "done" feature manually 2012-11-29 12:18:45 -08:00
git-remote-testpy.py Merge branch 'fc/remote-testgit-feature-done' 2013-01-14 08:15:46 -08:00
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'nz/send-email-headers-are-case-insensitive' into maint 2013-01-20 17:22:49 -08:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'jc/maint-fbsd-sh-ifs-workaround' into maint 2013-01-08 11:17:01 -08:00
git-stash.sh
git-submodule.sh submodule add: If --branch is given, record it in .gitmodules 2012-12-19 09:40:51 -08:00
git-svn.perl git-svn: Simplify calculation of GIT_DIR 2013-01-24 10:21:23 +00:00
GIT-VERSION-GEN Git 1.8.1.1 2013-01-14 08:04:50 -08:00
git-web--browse.sh
git.c Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c Merge branch 'mk/maint-graph-infinity-loop' into maint 2013-01-14 07:32:18 -08:00
graph.h
grep.c Merge branch 'nd/grep-true-path' into maint 2012-11-18 19:32:30 -08:00
grep.h Merge branch 'nd/grep-true-path' into maint 2012-11-18 19:32:30 -08:00
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c xml_entities(): use function strbuf_addstr_xml_quoted() 2012-11-26 13:30:52 -08:00
http-walker.c
http.c Merge branch 'rb/http-cert-cred-no-username-prompt' into maint 2013-01-10 14:03:54 -08:00
http.h http: do not set up curl auth after a 401 2012-10-12 09:45:15 -07:00
ident.c ident: keep separate "explicit" flags for author and committer 2012-11-15 17:47:24 -08:00
imap-send.c imap-send.c: simplify logic in lf_to_crlf() 2013-01-15 14:50:23 -08:00
INSTALL
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c Merge branch 'jc/ll-merge-binary-ours' into maint 2012-10-17 10:26:51 -07:00
ll-merge.h
lockfile.c
log-tree.c Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
log-tree.h get_patch_filename(): split into two functions 2012-12-21 23:55:40 -08:00
mailmap.c Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
mailmap.h mailmap: simplify map_user() interface 2013-01-10 12:33:08 -08:00
Makefile Merge branch 'nd/retire-fnmatch' 2013-01-25 12:34:55 -08:00
match-trees.c
merge-blobs.c Which merge_file() function do you mean? 2012-12-09 23:05:27 -08:00
merge-blobs.h Which merge_file() function do you mean? 2012-12-09 23:05:27 -08:00
merge-recursive.c Which merge_file() function do you mean? 2012-12-09 23:05:27 -08:00
merge-recursive.h Move try_merge_command and checkout_fast_forward to libgit.a 2012-10-29 03:08:30 -04:00
merge.c Move try_merge_command and checkout_fast_forward to libgit.a 2012-10-29 03:08:30 -04:00
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes.c Merge branch 'jc/same-encoding' into maint 2012-12-07 14:10:56 -08:00
notes.h format_note(): simplify API 2012-10-17 22:42:40 -07:00
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c Move setup_diff_pager to libgit.a 2012-10-29 03:08:30 -04:00
parse-options-cb.c
parse-options.c silence some -Wuninitialized false positives 2012-12-15 10:45:59 -08:00
parse-options.h fix clang -Wunused-value warnings for error functions 2013-01-16 12:47:46 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c longest_ancestor_length(): require prefix list entries to be normalized 2012-10-29 02:34:58 -04:00
pathspec.c add.c: extract new die_if_path_beyond_symlink() for reuse 2013-01-06 14:26:37 -08:00
pathspec.h add.c: extract new die_if_path_beyond_symlink() for reuse 2013-01-06 14:26:37 -08:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c logmsg_reencode: never return NULL 2013-01-26 13:28:21 -08:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
README README: it does not matter who the current maintainer is 2012-12-15 22:24:10 -08:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'rs/clarify-entry-cmp-sslice' 2013-01-23 21:19:06 -08:00
refs.h
RelNotes Start preparing for 1.8.1.2 2013-01-20 17:26:04 -08:00
remote-curl.c Merge branch 'jk/maint-http-half-auth-fetch' 2012-11-21 11:59:29 -08:00
remote-testsvn.c remote-testsvn: fix unitialized variable 2012-12-15 10:43:11 -08:00
remote.c Merge branch 'cr/push-force-tag-update' 2013-01-23 21:16:49 -08:00
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c log --use-mailmap: optimize for cases without --author/--committer search 2013-01-10 12:33:09 -08:00
revision.h Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
run-command.c hooks: Add function to check if a hook exists 2013-01-14 09:25:40 -08:00
run-command.h hooks: Add function to check if a hook exists 2013-01-14 09:25:40 -08:00
send-pack.c push: require force for refs under refs/tags/ 2012-12-02 01:44:34 -08:00
send-pack.h
sequencer.c learn to pick/revert into unborn branch 2012-12-23 10:40:37 -08:00
sequencer.h
server-info.c
setup.c Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c link_alt_odb_entries(): take (char *, len) rather than two pointers 2012-11-08 12:06:53 -05:00
sha1_name.c
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c Merge branch 'mh/unify-xml-in-imap-send-and-http-push' 2013-01-05 23:41:04 -08:00
strbuf.h Merge branch 'mh/unify-xml-in-imap-send-and-http-push' 2013-01-05 23:41:04 -08:00
streaming.c
streaming.h
string-list.c Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
string-list.h Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
submodule.c submodule: display summary header in bold 2012-11-18 19:18:13 -08:00
submodule.h submodule: display summary header in bold 2012-11-18 19:18:13 -08:00
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-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c longest_ancestor_length(): require prefix list entries to be normalized 2012-10-29 02:34:58 -04:00
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c string_list_longest_prefix(): remove function 2012-10-29 02:34:58 -04:00
test-subprocess.c
test-svn-fe.c remote-svn: add incremental import 2012-10-07 14:10:17 -07:00
test-wildmatch.c Makefile: add USE_WILDMATCH to use wildmatch as fnmatch 2013-01-01 15:32:37 -08:00
thread-utils.c
thread-utils.h
trace.c
transport-helper.c push: require force for refs under refs/tags/ 2012-12-02 01:44:34 -08:00
transport.c push: Add support for pre-push hooks 2013-01-18 11:13:22 -08:00
transport.h push: Add support for pre-push hooks 2013-01-18 11:13:22 -08:00
tree-diff.c
tree-walk.c tree_entry_interesting: do basedir compare on wildcard patterns when possible 2012-11-26 11:16:34 -08:00
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
unpack-trees.h
upload-pack.c Merge branch 'nd/upload-pack-shallow-must-be-commit' 2013-01-14 08:15:44 -08:00
url.c
url.h
usage.c make error()'s constant return value more visible 2012-12-15 10:45:58 -08:00
userdiff.c
userdiff.h
utf8.c Merge branch 'sp/shortlog-missing-lf' into maint 2013-01-10 14:04:23 -08:00
utf8.h Merge branch 'sp/shortlog-missing-lf' into maint 2013-01-10 14:04:23 -08:00
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c wildmatch: advance faster in <asterisk> + <literal> patterns 2013-01-01 15:32:37 -08:00
wildmatch.h wildmatch: support "no FNM_PATHNAME" mode 2013-01-01 15:32:37 -08:00
wrap-for-bin.sh
wrapper.c Merge branch 'jn/warn-on-inaccessible-loosen' into maint 2013-01-11 16:47:07 -08:00
write_or_die.c maybe_flush_or_die: move a too-loose Windows specific error 2012-10-17 00:33:42 -07:00
ws.c
wt-status.c Merge branch 'ap/status-ignored-in-ignored-directory' 2013-01-14 08:15:43 -08:00
wt-status.h
xdiff-interface.c
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 version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

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 (read
Documentation/SubmittingPatches for instructions on patch submission).
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.