1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 10:13:18 +01:00
Find a file
Junio C Hamano 91048a9537 push --force-with-lease: implement logic to populate old_sha1_expect[]
This plugs the push_cas_option data collected by the command line
option parser to the transport system with a new function
apply_push_cas(), which is called after match_push_refs() has
already been called.

At this point, we know which remote we are talking to, and what
remote refs we are going to update, so we can fill in the details
that may have been missing from the command line, such as

 (1) what abbreviated refname the user gave us matches the actual
     refname at the remote; and

 (2) which remote-tracking branch in our local repository to read
     the value of the object to expect at the remote.

to populate the old_sha1_expect[] field of each of the remote ref.
As stated in the documentation, the use of remote-tracking branch
as the default is a tentative one, and we may come up with a better
logic as we gain experience.

Still nobody uses this information, which is the topic of the next
patch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-22 22:18:19 -07:00
block-sha1
builtin push --force-with-lease: implement logic to populate old_sha1_expect[] 2013-07-22 22:18:19 -07:00
compat Merge branch 'fc/macos-x-clipped-write' into maint 2013-06-30 15:33:40 -07:00
contrib Merge branch 'dm/unbash-subtree' into maint 2013-07-03 15:39:37 -07:00
Documentation remote.c: add command line option parser for "--force-with-lease" 2013-07-22 22:02:55 -07:00
git-gui git-gui 0.18.0 2013-06-16 20:06:55 -07:00
git_remote_helpers
gitk-git Merge git://ozlabs.org/~paulus/gitk 2013-05-17 11:55:02 -07:00
gitweb gitweb: fix problem causing erroneous project list 2013-06-07 09:37:16 -07:00
mergetools
perl
po gitk: Update Swedish translation (304t) 2013-05-17 09:25:25 +10:00
ppc
t Merge branch 'tr/test-v-and-v-subtest-only' 2013-07-05 01:15:48 -07:00
templates pre-push.sample: Make the script executable 2013-06-11 11:22:00 -07:00
vcs-svn
xdiff diff: add --ignore-blank-lines option 2013-06-19 15:17:45 -07:00
.gitattributes
.gitignore Merge branch 'jc/topo-author-date-sort' 2013-07-01 12:41:23 -07:00
.mailmap .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand" 2013-06-25 15:18:43 -07:00
abspath.c
aclocal.m4
advice.c Merge branch 'mm/rm-coalesce-errors' 2013-06-24 13:48:35 -07:00
advice.h Merge branch 'mm/rm-coalesce-errors' 2013-06-24 13:48:35 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c Merge branch 'sb/archive-zip-double-assignment-fix' 2013-06-06 12:19:04 -07:00
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c register_ref(): make a copy of the bad reference SHA-1 2013-06-02 15:28:47 -07:00
bisect.h
blob.c
blob.h
branch.c Merge branch 'jh/checkout-auto-tracking' into maint 2013-06-27 14:37:21 -07:00
branch.h
builtin.h Merge branch 'jh/libify-note-handling' 2013-06-24 13:48:30 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c object_array_entry: fix memory handling of the name field 2013-06-02 15:28:46 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h cache.h: move remote/connect API out of it 2013-07-08 14:34:24 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c make color.ui default to 'auto' 2013-06-10 10:55:42 -07:00
color.h
column.c
column.h
combine-diff.c Merge branch 'cb/log-follow-with-combined' into maint 2013-07-03 15:30:59 -07:00
command-list.txt
commit-slab.h commit-slab: introduce a macro to define a slab for new type 2013-06-07 10:02:12 -07:00
commit.c Merge branch 'jc/topo-author-date-sort' 2013-07-01 12:41:23 -07:00
commit.h Merge branch 'jc/topo-author-date-sort' 2013-07-01 12:41:23 -07:00
config.c Merge branch 'jc/core-checkstat' into maint 2013-07-03 15:39:15 -07:00
config.mak.in
config.mak.uname Merge branch 'fc/macos-x-clipped-write' into maint 2013-06-30 15:33:40 -07:00
configure.ac configure: fix option help message for --disable-pthreads 2013-06-28 10:49:26 -07:00
connect.c cache.h: move remote/connect API out of it 2013-07-08 14:34:24 -07:00
connect.h cache.h: move remote/connect API out of it 2013-07-08 14:34:24 -07:00
connected.c clone: open a shortcut for connectivity check 2013-05-28 08:07:20 -07:00
connected.h clone: open a shortcut for connectivity check 2013-05-28 08:07:20 -07:00
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
daemon.c
date.c Merge branch 'jc/prune-all' 2013-05-29 14:23:04 -07:00
decorate.c decorate.c: compact table when growing 2013-05-16 11:51:08 -07:00
decorate.h
delta.h
diff-delta.c
diff-lib.c diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const 2013-06-02 15:31:14 -07:00
diff-no-index.c
diff.c diff: add --ignore-blank-lines option 2013-06-19 15:17:45 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diffcore-pickaxe: make error messages more consistent 2013-06-03 10:50:22 -07:00
diffcore-rename.c
diffcore.h
dir.c Merge branch 'jn/config-ignore-inaccessible' into maint 2013-06-09 17:06:56 -07:00
dir.h
editor.c
entry.c
environment.c core: use env variable instead of config var to turn on logging pack access 2013-06-09 16:07:50 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'fc/fast-export-persistent-marks' 2013-06-02 15:48:28 -07:00
fetch-pack.c cache.h: move remote/connect API out of it 2013-07-08 14:34:24 -07:00
fetch-pack.h cache.h: move remote/connect API out of it 2013-07-08 14:34:24 -07:00
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl add -i: add extra options at the right place in "diff" command line 2013-06-23 13:39:39 -07:00
git-am.sh am: replace uses of --resolved with --continue 2013-06-27 09:37:12 -07:00
git-archimport.perl
git-bisect.sh bisect: Fix log output for multi-parent skip ranges 2013-05-22 15:40:43 -07:00
git-compat-util.h Merge branch 'fc/macos-x-clipped-write' into maint 2013-06-30 15:33:40 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl difftool --dir-diff: allow changing any clean working tree file 2013-05-29 12:50:08 -07:00
git-filter-branch.sh
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool--lib: refactor {diff,merge}_cmd logic 2013-06-17 13:12:55 -07:00
git-mergetool.sh
git-p4.py Merge branch 'vl/typofix' 2013-06-26 15:07:52 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'jk/pull-into-dirty-unborn' 2013-06-27 14:29:52 -07:00
git-quiltimport.sh
git-rebase--am.sh am: return control to caller, for housekeeping 2013-05-12 23:20:07 -07:00
git-rebase--interactive.sh rebase -i: handle fixup! fixup! in --autosquash 2013-06-27 13:52:41 -07:00
git-rebase--merge.sh rebase --merge: return control to caller, for housekeeping 2013-05-12 23:20:08 -07:00
git-rebase.sh Merge branch 'rr/rebase-stash-store' 2013-06-27 14:29:41 -07:00
git-relink.perl
git-remote-testgit.sh Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile 2013-06-07 16:15:32 -07:00
git-remote-testpy.py
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'mt/send-email-cc-match-fix' 2013-06-27 14:29:57 -07:00
git-sh-i18n.sh
git-sh-setup.sh sh-setup: add new peel_committish() helper 2013-06-14 09:41:03 -07:00
git-stash.sh stash: introduce 'git stash store' 2013-06-17 11:43:13 -07:00
git-submodule.sh Merge branch 'jk/submodule-subdirectory-ok' 2013-06-30 15:39:35 -07:00
git-svn.perl Merge branch 'vl/typofix' 2013-06-26 15:07:52 -07:00
GIT-VERSION-GEN Git 1.8.3.2 2013-06-28 14:56:30 -07:00
git-web--browse.sh web--browse: support /usr/bin/cygstart on Cygwin 2013-06-21 09:05:15 -07:00
git.c Merge branch 'nd/clone-connectivity-shortcut' 2013-06-06 12:17:55 -07:00
git.rc Provide a Windows version resource for the git executables. 2013-06-04 10:11:08 +01:00
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash.c
hash.h
help.c Merge branch 'rj/mingw-cygwin' 2013-06-11 13:30:20 -07:00
help.h
hex.c
http-backend.c show_head_ref(): rename first parameter to "refname" 2013-06-02 15:28:47 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'bc/http-keep-memory-given-to-curl' 2013-06-27 14:29:49 -07:00
http.h
ident.c
imap-send.c imap-send: eliminate HMAC deprecation warnings on Mac OS X 2013-05-21 13:26:37 -07:00
INSTALL
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Merge branch 'tr/line-log' 2013-06-02 16:00:44 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'maint' 2013-07-05 01:16:27 -07:00
match-trees.c match-trees: factor out fill_tree_desc_strict 2013-06-13 14:45:38 -07:00
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Move create_notes_commit() from notes-merge.c into notes-utils.c 2013-06-12 10:38:13 -07:00
notes-merge.h Move create_notes_commit() from notes-merge.c into notes-utils.c 2013-06-12 10:38:13 -07:00
notes-utils.c Move create_notes_commit() from notes-merge.c into notes-utils.c 2013-06-12 10:38:13 -07:00
notes-utils.h Move create_notes_commit() from notes-merge.c into notes-utils.c 2013-06-12 10:38:13 -07:00
notes.c string_list_add_refs_by_glob(): add a comment about memory management 2013-06-02 15:28:47 -07:00
notes.h
object.c Merge branch 'mh/reflife' 2013-06-14 08:46:14 -07:00
object.h object_array_entry: fix memory handling of the name field 2013-06-02 15:28:46 -07:00
pack-check.c
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c
parse-options.h Merge branch 'jc/prune-all' 2013-05-29 14:23:04 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
prio-queue.c sort-in-topological-order: use prio-queue 2013-06-11 15:15:21 -07:00
prio-queue.h sort-in-topological-order: use prio-queue 2013-06-11 15:15:21 -07:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maint 2013-07-03 15:40:38 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c cache.h: move remote/connect API out of it 2013-07-08 14:34:24 -07:00
refs.h refs: implement simple transactions for the packed-refs file 2013-06-20 15:50:17 -07:00
RelNotes Start preparing for 1.8.3.3 2013-06-30 15:36:03 -07:00
remote-curl.c
remote-testsvn.c
remote.c push --force-with-lease: implement logic to populate old_sha1_expect[] 2013-07-22 22:18:19 -07:00
remote.h push --force-with-lease: implement logic to populate old_sha1_expect[] 2013-07-22 22:18:19 -07:00
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/topo-author-date-sort' 2013-07-01 12:41:23 -07:00
revision.h Merge branch 'jc/topo-author-date-sort' 2013-07-01 12:41:23 -07:00
run-command.c
run-command.h
send-pack.c cache.h: move remote/connect API out of it 2013-07-08 14:34:24 -07:00
send-pack.h
sequencer.c Merge branch 'rr/cherry-pick-fast-forward-reflog-message' 2013-06-27 14:30:00 -07:00
sequencer.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'jk/unpack-entry-fallback-to-another' 2013-06-23 14:53:20 -07:00
sha1_name.c Merge branch 'rr/die-on-missing-upstream' into maint 2013-07-03 15:30:24 -07:00
shallow.c fetch-pack: prepare updated shallow file before fetching the pack 2013-05-28 08:06:08 -07:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'mh/reflife' 2013-06-14 08:46:14 -07:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c Merge branch 'js/test-ln-s-add' 2013-06-20 16:02:18 -07:00
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
test-prio-queue.c prio-queue: priority queue of pointers to structs 2013-06-11 15:15:21 -07:00
test-read-cache.c read-cache: add simple performance test 2013-06-09 17:03:00 -07: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
test-subprocess.c
test-svn-fe.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c transport-helper: be quiet on read errors from helpers 2013-06-21 09:03:53 -07:00
transport.c push --force-with-lease: implement logic to populate old_sha1_expect[] 2013-07-22 22:18:19 -07:00
transport.h push --force-with-lease: implement logic to populate old_sha1_expect[] 2013-07-22 22:18:19 -07:00
tree-diff.c
tree-walk.c
tree-walk.h unpack-trees: don't shift conflicts left and right 2013-06-17 09:24:47 -07:00
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'rs/unpack-trees-tree-walk-conflict-field' 2013-06-24 13:48:44 -07:00
unpack-trees.h diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const 2013-06-02 15:31:14 -07:00
upload-pack.c cache.h: move remote/connect API out of it 2013-07-08 14:34:24 -07:00
url.c
url.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c wildmatch: properly fold case everywhere 2013-06-02 14:13:05 -07:00
wildmatch.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c am: replace uses of --resolved with --continue 2013-06-27 09:37:12 -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/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://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.