1
0
mirror of https://github.com/git/git.git synced 2024-10-19 16:28:32 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Junio C Hamano 5bf29b9500 read_sha1_file(): allow selective bypassing of replacement mechanism
The way "object replacement" mechanism was tucked to the read_sha1_file()
interface was suboptimal in a couple of ways:

 - Callers that want it to die with useful diagnosis upon seeing a corrupt
   object does not have a way to say that they do not want any object
   replacement.

 - Callers who do not want it to die but want to handle the errors
   themselves are told to arrange to call read_object(), but the function
   does not use the replacement mechanism, and also it is a file scope
   static function that not many callers can call to begin with.

This adds a read_sha1_file_extended() that takes a set of flags; the
callers of read_sha1_file() passes a flag READ_SHA1_FILE_REPLACE to ask
for object replacement mechanism to kick in.

Later, we could add another flag bit to tell the function to return an
error instead of dying and then remove the misguided "call read_object()
yourself".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-05-15 15:23:34 -07:00
block-sha1
builtin read_sha1_file(): get rid of read_sha1_file_repl() madness 2011-05-15 15:23:33 -07:00
compat remove doubled words, e.g., s/to to/to/, and fix related typos 2011-04-13 11:59:11 -07:00
contrib Merge branch 'sg/completion-cleanup' 2011-05-06 10:52:03 -07:00
Documentation Update draft release notes to 1.7.6 2011-05-06 11:13:08 -07:00
git_remote_helpers
git-gui Merge git-gui 0.14.0 2011-03-26 10:42:35 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2011-04-11 09:33:06 -07:00
gitweb gitweb: supply '-n' to gzip for identical output 2011-04-26 13:14:02 -07:00
perl
po i18n: Makefile: "pot" target to extract messages marked for translation 2011-03-09 23:52:52 -08:00
ppc
t t6050: make sure we test not just commit replacement 2011-05-15 15:23:32 -07:00
templates
vcs-svn Merge branch 'rj/sparse' 2011-04-27 11:36:42 -07:00
xdiff
.gitattributes
.gitignore Merge branch 'mz/rebase' 2011-04-28 14:11:39 -07:00
.mailmap
abspath.c Name make_*_path functions more accurately 2011-03-17 16:08:30 -07:00
aclocal.m4
advice.c
advice.h
alias.c
alloc.c unbreak and eliminate NO_C99_FORMAT 2011-03-17 15:30:49 -07:00
archive-tar.c
archive-zip.c
archive.c Convert read_tree{,_recursive} to support struct pathspec 2011-03-25 09:20:33 -07:00
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.h
blob.c
blob.h
branch.c Merge branch 'jh/maint-do-not-track-non-branches' 2011-03-15 14:22:13 -07:00
branch.h
builtin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h read_sha1_file(): allow selective bypassing of replacement mechanism 2011-05-15 15:23:34 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c Share color list between graph and show-branch 2011-04-04 23:20:39 -07:00
color.h Share color list between graph and show-branch 2011-04-04 23:20:39 -07:00
combine-diff.c
command-list.txt
commit.c
commit.h Declare lookup_replace_object() in cache.h, not in commit.h 2011-05-15 15:23:31 -07:00
config.c Merge branch 'jc/pack-objects-bigfile' into maint 2011-05-04 14:57:38 -07:00
config.mak.in unbreak and eliminate NO_C99_FORMAT 2011-03-17 15:30:49 -07:00
configure.ac Improve test for pthreads flag 2011-03-28 10:54:54 -07:00
connect.c
convert.c enums: omit trailing comma for portability 2011-03-16 12:31:32 -07:00
copy.c
COPYING
csum-file.c sparse: Fix errors and silence warnings 2011-04-03 10:14:53 -07:00
csum-file.h
ctype.c
daemon.c Fix sparse warnings 2011-03-22 10:16:54 -07:00
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 'jc/fix-diff-files-unmerged' 2011-05-06 10:52:58 -07:00
diff-no-index.c
diff.c Merge branch 'jc/fix-diff-files-unmerged' 2011-05-06 10:52:58 -07:00
diff.h Merge branch 'jc/fix-diff-files-unmerged' 2011-05-06 10:52:58 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'mz/maint-rename-unmerged' 2011-05-02 15:58:27 -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 inline lookup_replace_object() calls 2011-05-15 15:23:33 -07:00
exec_cmd.c Name make_*_path functions more accurately 2011-03-17 16:08:30 -07:00
exec_cmd.h
fast-import.c Merge branch 'jc/pack-objects-bigfile' into maint 2011-05-04 14:57:38 -07:00
fetch-pack.h standardize brace placement in struct definitions 2011-03-16 12:49:02 -07:00
fixup-builtins
fsck.c strbuf: add strbuf_vaddf 2011-02-26 01:06:50 -08:00
fsck.h
generate-cmdlist.sh standardize brace placement in struct definitions 2011-03-16 12:49:02 -07:00
gettext.c i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set 2011-03-08 12:10:03 -08:00
gettext.h i18n: avoid parenthesized string as array initializer 2011-04-11 10:33:51 -07:00
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh bisect: visualize with git-log if gitk is unavailable 2011-03-21 10:23:45 -07:00
git-compat-util.h Merge branch 'maint' 2011-04-03 13:53:11 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl Merge branch 'gr/cvsimport-alternative-cvspass-location' 2011-05-06 10:52:12 -07:00
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh git-instaweb: Change how gitweb.psgi is made runnable as standalone app 2011-02-27 22:02:31 -08:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh Merge branch 'jk/merge-one-file-working-tree' 2011-05-06 10:54:08 -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 mergetool: Teach about submodules 2011-04-13 12:21:45 -07:00
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 Merge branch 'aw/maint-rebase-i-p-no-ff' 2011-05-06 10:50:00 -07:00
git-rebase--merge.sh
git-rebase.sh rebase: define options in OPTIONS_SPEC 2011-03-04 16:10:06 -08:00
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh git-request-pull: open-code the only invocation of get_remote_url 2011-03-02 12:26:58 -08:00
git-send-email.perl git-send-email: fix missing space in error message 2011-04-29 11:34:32 -07:00
git-sh-setup.sh
git-stash.sh Merge branch 'jk/maint-stash-oob' into maint 2011-05-04 14:58:42 -07:00
git-submodule.sh Merge branch 'nm/submodule-update-force' 2011-05-02 15:58:36 -07:00
git-svn.perl Merge branch 'mh/git-svn-automkdirs' 2011-04-27 11:36:41 -07:00
GIT-VERSION-GEN Git 1.7.5.1 2011-05-04 15:47:40 -07:00
git-web--browse.sh
git.c Merge branch 'js/info-man-path' 2011-05-06 11:00:46 -07:00
git.spec.in
graph.c Share color list between graph and show-branch 2011-04-04 23:20:39 -07:00
graph.h
grep.c
grep.h
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c Fix two unused variable warnings in gcc 4.6 2011-04-03 10:59:40 -07:00
http-push.c standardize brace placement in struct definitions 2011-03-16 12:49:02 -07:00
http-walker.c standardize brace placement in struct definitions 2011-03-16 12:49:02 -07:00
http.c Merge branch 'sp/maint-clear-postfields' into maint 2011-05-04 14:58:56 -07:00
http.h standardize brace placement in struct definitions 2011-03-16 12:49:02 -07:00
ident.c
imap-send.c sparse: Fix some "Using plain integer as NULL pointer" warnings 2011-04-11 10:35:25 -07:00
INSTALL
levenshtein.c
levenshtein.h
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 Name make_*_path functions more accurately 2011-03-17 16:08:30 -07:00
log-tree.c git-log: put space after commit mark 2011-03-10 21:55:29 -08:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'js/info-man-path' 2011-05-06 11:00:46 -07:00
match-trees.c
merge-file.c sparse: Fix an "symbol 'merge_file' not decared" warning 2011-04-11 10:35:25 -07:00
merge-file.h sparse: Fix an "symbol 'merge_file' not decared" warning 2011-04-11 10:35:25 -07:00
merge-recursive.c Merge branch 'nd/struct-pathspec' 2011-05-06 10:50:06 -07:00
merge-recursive.h Merge branch 'jk/merge-rename-ux' 2011-03-19 23:23:56 -07:00
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Fix sparse warnings 2011-03-22 10:16:54 -07:00
notes-merge.h
notes.c notes: refactor display notes default handling 2011-03-29 14:31:59 -07:00
notes.h notes: refactor display notes default handling 2011-03-29 14:31:59 -07:00
object.c read_sha1_file(): get rid of read_sha1_file_repl() madness 2011-05-15 15:23:33 -07:00
object.h object.h: Remove obsolete struct object_refs 2011-03-14 10:49:28 -07:00
pack-check.c sparse: Fix errors and silence warnings 2011-04-03 10:14:53 -07:00
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options.c Fix sparse warnings 2011-03-22 10:16:54 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Name make_*_path functions more accurately 2011-03-17 16:08:30 -07:00
pkt-line.c sparse: Fix errors and silence warnings 2011-04-03 10:14:53 -07:00
pkt-line.h
preload-index.c
pretty.c Merge branch 'jk/format-patch-quote-special-in-from' 2011-05-06 10:50:18 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c Remove unused variables 2011-03-22 11:43:27 -07:00
reachable.h
read-cache.c Merge branch 'jc/index-update-if-able' into maint 2011-04-03 12:33:05 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c
refs.h
RelNotes Start 1.7.5.1 maintenance track 2011-04-29 11:47:35 -07:00
remote-curl.c Merge branch 'sp/maint-smart-http-sans-100-continue' 2011-03-14 11:59:10 -07:00
remote.c
remote.h
replace_object.c inline lookup_replace_object() calls 2011-05-15 15:23:33 -07:00
rerere.c sparse: Fix errors and silence warnings 2011-04-03 10:14:53 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c revision.c: make --no-notes reset --notes list 2011-03-29 14:39:24 -07:00
revision.h rev-list --count: separate count for --cherry-mark 2011-04-26 13:13:20 -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 'nd/maint-setup' 2011-05-02 15:58:30 -07:00
sha1_file.c read_sha1_file(): allow selective bypassing of replacement mechanism 2011-05-15 15:23:34 -07:00
sha1_name.c sha1_name: Suggest commit:./file for path in subdir 2011-04-03 12:24:27 -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 standardize brace placement in struct definitions 2011-03-16 12:49:02 -07:00
submodule.c Merge branch 'jl/submodule-fetch-on-demand' 2011-04-04 15:02:01 -07:00
submodule.h fetch/pull: Add the 'on-demand' value to the --recurse-submodules option 2011-03-09 13:10:35 -08:00
symlinks.c do not overwrite untracked symlinks 2011-02-21 22:51:07 -08: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-index-version.c
test-line-buffer.c vcs-svn: remove buffer_read_string 2011-03-26 00:17:35 -05:00
test-match-trees.c
test-mktemp.c
test-obj-pool.c
test-parse-options.c
test-path-utils.c Name make_*_path functions more accurately 2011-03-17 16:08:30 -07:00
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 Remove unused variables 2011-03-22 11:43:27 -07:00
test-svn-fe.c
test-treap.c
thread-utils.c Fix sparse warnings 2011-03-22 10:16:54 -07:00
thread-utils.h
trace.c Fix sparse warnings 2011-03-22 10:16:54 -07:00
transport-helper.c Remove unused variables 2011-03-22 11:43:27 -07:00
transport.c Merge branch 'jc/maint-fetch-alt' 2011-03-22 21:37:53 -07:00
transport.h refs_from_alternate: helper to use refs from alternates 2011-03-17 16:18:47 -07:00
tree-diff.c Merge branch 'nd/struct-pathspec' 2011-05-06 10:50:06 -07:00
tree-walk.c pathspec: rename per-item field has_wildcard to use_wildcard 2011-04-05 09:30:36 -07:00
tree-walk.h
tree.c Convert read_tree{,_recursive} to support struct pathspec 2011-03-25 09:20:33 -07:00
tree.h Convert read_tree{,_recursive} to support struct pathspec 2011-03-25 09:20:33 -07:00
unimplemented.sh
unpack-trees.c Fix sparse warnings 2011-03-22 10:16:54 -07:00
unpack-trees.h
upload-pack.c Merge branch 'jk/maint-upload-pack-shallow' into maint 2011-05-04 14:58:13 -07:00
url.c Fix sparse warnings 2011-03-22 10:16:54 -07:00
url.h
usage.c Fix sparse warnings 2011-03-22 10:16:54 -07:00
userdiff.c
userdiff.h
utf8.c strbuf: add fixed-length version of add_wrapped_text 2011-02-23 13:44:36 -08:00
utf8.h strbuf: add fixed-length version of add_wrapped_text 2011-02-23 13:44:36 -08:00
walker.c
walker.h
wrap-for-bin.sh
wrapper.c Merge branch 'ae/better-template-failure-report' into maint 2011-03-20 22:09:39 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'ab/i18n-st' 2011-04-01 17:55:55 -07:00
wt-status.h Merge branch 'jn/status-translatable' 2011-03-19 23:24:19 -07:00
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.
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.