1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 06:17:56 +01:00
Find a file
Michael Haggerty e426ff4222 initial_ref_transaction_commit(): check for ref D/F conflicts
In initial_ref_transaction_commit(), check for D/F conflicts (i.e.,
the type of conflict that exists between "refs/foo" and
"refs/foo/bar") among the references being created and between the
references being created and any hypothetical existing references.

Ideally, there shouldn't *be* any existing references when this
function is called. But, at least in the case of the "testgit" remote
helper, "clone" can be called after the remote-tracking "HEAD" and
"master" branches have already been created. So let's just do the
full-blown check.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-06-22 13:17:12 -07:00
block-sha1
builtin initial_ref_transaction_commit(): function for initial ref creation 2015-06-22 13:17:11 -07:00
compat Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
contrib Merge branch 'tb/complete-sequencing' 2015-06-11 09:29:59 -07:00
Documentation Second half of seventh batch 2015-06-11 09:35:25 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools mergetools: add winmerge as a builtin tool 2015-05-20 13:13:44 -07:00
perl
po
ppc
t Merge branch 'jk/squelch-missing-link-warning-for-unreachable' 2015-06-11 09:29:59 -07:00
templates
vcs-svn
xdiff
.gitattributes
.gitignore
.mailmap
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c Merge branch 'pt/xdg-config-path' into maint 2015-06-05 12:00:04 -07:00
attr.h
base85.c
bisect.c register_ref(): rewrite to take an object_id argument 2015-05-25 12:19:28 -07:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h delete_ref(): move declaration to refs.h 2015-06-22 13:17:08 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/color-diff-plain-is-context' 2015-06-11 09:29:53 -07:00
command-list.txt command-list.txt: drop the "common" tag 2015-05-21 13:03:37 -07:00
commit-slab.h
commit.c Merge branch 'jk/squelch-missing-link-warning-for-unreachable' 2015-06-11 09:29:59 -07:00
commit.h Merge branch 'jk/squelch-missing-link-warning-for-unreachable' 2015-06-11 09:29:59 -07:00
config.c Merge branch 'jk/diagnose-config-mmap-failure' 2015-06-11 09:29:55 -07:00
config.mak.in
config.mak.uname
configure.ac
connect.c Merge branch 'bc/connect-plink' into maint 2015-06-05 12:00:11 -07:00
connect.h
connected.c
connected.h
convert.c filter_buffer_or_fd(): ignore EPIPE 2015-05-20 10:19:12 -07:00
convert.h
copy.c copy.c: make copy_fd() report its status silently 2015-05-19 14:48:54 -07:00
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c Merge branch 'pt/xdg-config-path' into maint 2015-06-05 12:00:04 -07:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'nd/diff-i-t-a' 2015-05-19 13:17:49 -07:00
diff-no-index.c
diff.c Merge branch 'jk/color-diff-plain-is-context' 2015-06-11 09:29:53 -07:00
diff.h Merge branch 'jk/color-diff-plain-is-context' 2015-06-11 09:29:53 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'jc/gitignore-precedence' into maint 2015-06-05 12:00:13 -07:00
dir.h Merge branch 'nd/untracked-cache' 2015-05-26 13:24:46 -07:00
editor.c
entry.c
environment.c
exec_cmd.c Merge branch 'jk/git-no-more-argv0-path-munging' into maint 2015-05-26 13:49:18 -07:00
exec_cmd.h
fast-import.c
fetch-pack.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.perl generate-cmdlist: parse common group commands 2015-05-21 13:03:37 -07:00
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'jk/diagnose-config-mmap-failure' 2015-06-11 09:29:55 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool--lib: set IFS for difftool and mergetool 2015-05-20 13:13:42 -07:00
git-mergetool.sh mergetool--lib: set IFS for difftool and mergetool 2015-05-20 13:13:42 -07:00
git-p4.py Merge branch 'mt/p4-depotFile-at-version' 2015-06-11 09:29:55 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'pt/pull-log-n' into maint 2015-06-05 12:00:24 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'mm/rebase-i-post-rewrite-exec' 2015-06-01 12:45:20 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'jk/rebase-quiet-noop' into maint 2015-05-26 13:49:23 -07:00
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'jk/stash-options' 2015-06-01 12:45:14 -07:00
git-submodule.sh
git-svn.perl
GIT-VERSION-GEN Git 2.4.3 2015-06-05 12:22:33 -07:00
git-web--browse.sh
git.c
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hashmap.c
hashmap.h
help.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
help.h
hex.c
http-backend.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'ls/http-ssl-cipher-list' 2015-05-22 12:41:45 -07:00
http.h
ident.c
imap-send.c
INSTALL
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c Merge branch 'jk/color-diff-plain-is-context' 2015-06-11 09:29:53 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c Merge branch 'jk/squelch-missing-link-warning-for-unreachable' 2015-06-11 09:29:59 -07:00
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c Merge branch 'jc/ignore-epipe-in-filter' 2015-05-22 12:41:57 -07:00
lockfile.h lockfile: allow file locking to be retried with a timeout 2015-05-14 14:51:08 -07:00
log-tree.c add_ref_decoration(): convert local variable original_sha1 to object_id 2015-05-25 12:19:34 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'jk/skip-http-tests-under-no-curl' into maint 2015-06-05 12:00:28 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c use file_exists() to check if a file exists in the worktree 2015-05-20 13:49:10 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c string_list_add_one_ref(): rewrite to take an object_id argument 2015-05-25 12:19:34 -07:00
notes.h
object.c Merge branch 'jk/type-from-string-gently' into maint 2015-05-13 14:05:54 -07:00
object.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint 2015-06-05 12:00:22 -07:00
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'pt/xdg-config-path' into maint 2015-06-05 12:00:04 -07:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
prio-queue.c
prio-queue.h
progress.c progress: treat "no terminal" as being in the foreground 2015-05-19 09:35:14 -07:00
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c add_one_ref(): rewrite to take an object_id argument 2015-05-25 12:19:34 -07:00
reachable.h
read-cache.c Merge branch 'jk/diagnose-config-mmap-failure' 2015-06-11 09:29:55 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c initial_ref_transaction_commit(): check for ref D/F conflicts 2015-06-22 13:17:12 -07:00
refs.h refs: remove some functions from the module's public interface 2015-06-22 13:17:11 -07:00
RelNotes Git 2.4.3 2015-06-05 12:22:33 -07:00
remote-curl.c
remote-testsvn.c
remote.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
remote.h remote.c: add branch_get_push 2015-05-22 09:33:08 -07:00
replace_object.c register_replace_ref(): rewrite to take an object_id argument 2015-05-25 12:19:35 -07:00
rerere.c Merge branch 'jk/rerere-forget-check-enabled' into maint 2015-06-05 12:00:25 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jk/squelch-missing-link-warning-for-unreachable' 2015-06-11 09:29:59 -07:00
revision.h
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c
sequencer.h
server-info.c add_info_ref(): rewrite to take an object_id argument 2015-05-25 12:19:35 -07:00
setup.c Merge branch 'nd/dwim-wildcards-as-pathspecs' 2015-05-19 13:17:58 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/diagnose-config-mmap-failure' 2015-06-11 09:29:55 -07:00
sha1_name.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
shallow.c shallow: rewrite functions to take object_id arguments 2015-05-25 12:19:36 -07:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-config.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-dump-split-index.c
test-dump-untracked-cache.c
test-genrandom.c
test-hashmap.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
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1-array.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c
transport.c write_one_ref(): rewrite to take an object_id argument 2015-05-25 12:19:36 -07:00
transport.h
tree-diff.c
tree-walk.c tree-walk: learn get_tree_entry_follow_symlinks 2015-05-20 13:45:49 -07:00
tree-walk.h tree-walk: learn get_tree_entry_follow_symlinks 2015-05-20 13:45:49 -07:00
tree.c Merge branch 'jk/squelch-missing-link-warning-for-unreachable' 2015-06-11 09:29:59 -07:00
tree.h Merge branch 'jk/squelch-missing-link-warning-for-unreachable' 2015-06-11 09:29:59 -07:00
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c
unpack-trees.h
update_unicode.sh
upload-pack.c Merge branch 'bc/object-id' 2015-06-05 12:17:37 -07:00
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c mark_complete(): rewrite to take an object_id argument 2015-05-25 12:19:37 -07:00
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'jk/at-push-sha1' 2015-06-05 12:17:36 -07: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/giteveryday.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://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.