kernel/git - git - PowerEL Git System

Junio C Hamano 28f5d17611 remote.c: add command line option parser for "--force-with-lease" Update "git push" and "git send-pack" to parse this commnd line option. The intended sematics is: * "--force-with-lease" alone, without specifying the details, will protect _all_ remote refs that are going to be updated by requiring their current value to be the same as some reasonable default, unless otherwise specified; * "--force-with-lease=refname", without specifying the expected value, will protect that refname, if it is going to be updated, by requiring its current value to be the same as some reasonable default. * "--force-with-lease=refname:value" will protect that refname, if it is going to be updated, by requiring its current value to be the same as the specified value; and * "--no-force-with-lease" will cancel all the previous --force-with-lease on the command line. For now, "some reasonable default" is tentatively defined as "the value of the remote-tracking branch we have for the ref of the remote being updated", and it is an error if we do not have such a remote-tracking branch. But this is known to be fragile, its use is not yet recommended, and hopefully we will find more reasonable default as we gain experience with this feature. The manual marks the feature as experimental unless the expected value is specified explicitly for this reason. Because the command line options are parsed _before_ we know which remote we are pushing to, there needs further processing to the parsed data after we instantiate the transport object to: * expand "refname" given by the user to a full refname to be matched with the list of "struct ref" used in match_push_refs() and set_ref_status_for_push(); and * learning the actual local ref that is the remote-tracking branch for the specified remote ref. Further, some processing need to be deferred until we find the set of remote refs and match_push_refs() returns in order to find the ones that need to be checked after explicit ones have been processed for "--force-with-lease" (no specific details). These post-processing will be the topic of the next patch. This option was originally called "cas" (for "compare and swap"), the name which nobody liked because it was too technical. The second attempt called it "lockref" (because it is conceptually like pushing after taking a lock) but the word "lock" was hated because it implied that it may reject push by others, which is not the way this option works. This round calls it "force-with-lease". You assume you took the lease on the ref when you fetched to decide what the rebased history should be, and you can push back only if the lease has not been broken. Signed-off-by: Junio C Hamano <gitster@pobox.com>		12 years ago
Documentation	remote.c: add command line option parser for "--force-with-lease"	12 years ago
block-sha1	…
builtin	remote.c: add command line option parser for "--force-with-lease"	12 years ago
compat	…
contrib	Merge branch 'dm/unbash-subtree' into maint	12 years ago
git-gui	…
git_remote_helpers	…
gitk-git	…
gitweb	…
mergetools	…
perl	…
po	…
ppc	…
t	Merge branch 'tr/test-v-and-v-subtest-only'	12 years ago
templates	…
vcs-svn	…
xdiff	…
.gitattributes	…
.gitignore	…
.mailmap	…
COPYING	…
GIT-VERSION-GEN	…
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'maint'	12 years ago
README	…
RelNotes	…
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	…
attr.h	…
base85.c	…
bisect.c	…
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	cache.h: move remote/connect API out of it	12 years ago
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit-slab.h	…
commit.c	…
commit.h	…
config.c	Merge branch 'jc/core-checkstat' into maint	12 years ago
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	cache.h: move remote/connect API out of it	12 years ago
connect.h	cache.h: move remote/connect API out of it	12 years ago
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
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	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	…
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir.c	…
dir.h	…
editor.c	…
entry.c	…
environment.c	…
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	…
fetch-pack.c	cache.h: move remote/connect API out of it	12 years ago
fetch-pack.h	cache.h: move remote/connect API out of it	12 years ago
fmt-merge-msg.h	…
fsck.c	…
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	…
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-difftool.perl	…
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	…
git-mergetool.sh	…
git-p4.py	…
git-parse-remote.sh	…
git-pull.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	…
git-rebase--merge.sh	…
git-rebase.sh	…
git-relink.perl	…
git-remote-testgit.sh	…
git-remote-testpy.py	…
git-repack.sh	…
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	…
git-svn.perl	…
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	…
hash.c	…
hash.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	…
imap-send.c	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
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	…
log-tree.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
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	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object.c	…
object.h	…
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	…
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	…
prio-queue.h	…
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	12 years ago
reflog-walk.c	…
reflog-walk.h	…
refs.c	cache.h: move remote/connect API out of it	12 years ago
refs.h	…
remote-curl.c	…
remote-testsvn.c	…
remote.c	remote.c: add command line option parser for "--force-with-lease"	12 years ago
remote.h	remote.c: add command line option parser for "--force-with-lease"	12 years ago
replace_object.c	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	…
run-command.c	…
run-command.h	…
send-pack.c	cache.h: move remote/connect API out of it	12 years ago
send-pack.h	…
sequencer.c	…
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	…
sha1_name.c	…
shallow.c	…
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	…
submodule.h	…
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	…
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.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.c	cache.h: move remote/connect API out of it	12 years ago
transport.h	cache.h: move remote/connect API out of it	12 years ago
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	…
unpack-trees.h	…
upload-pack.c	cache.h: move remote/connect API out of it	12 years ago
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.h	…
wrap-for-bin.sh	…
wrapper.c	…
write_or_die.c	…
ws.c	…
wt-status.c	…
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	…

README

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

	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.