Junio C Hamano 2233ad4534 Merge branch 'jc/push-cas' ... Allow a safer "rewind of the remote tip" push than blind "--force", by requiring that the overwritten remote ref to be unchanged since the new history to replace it was prepared. The machinery is more or less ready. The "--force" option is again the big red button to override any safety, thanks to J6t's sanity (the original round allowed --lockref to defeat --force). The logic to choose the default implemented here is fragile (e.g. "git fetch" after seeing a failure will update the remote-tracking branch and will make the next "push" pass, defeating the safety pretty easily). It is suitable only for the simplest workflows, and it may hurt users more than it helps them. * jc/push-cas: push: teach --force-with-lease to smart-http transport send-pack: fix parsing of --force-with-lease option t5540/5541: smart-http does not support "--force-with-lease" t5533: test "push --force-with-lease" push --force-with-lease: tie it all together push --force-with-lease: implement logic to populate old_sha1_expect[] remote.c: add command line option parser for "--force-with-lease" builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN cache.h: move remote/connect API out of it		2013-09-09 14:30:29 -07:00
..
add.c	Merge branch 'mm/color-auto-default'	2013-07-22 11:23:10 -07:00
annotate.c
apply.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
archive.c
bisect--helper.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
blame.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
branch.c	branch, commit, name-rev: ease up boolean conditions	2013-08-07 08:30:30 -07:00
bundle.c
cat-file.c	Revert "cat-file: split --batch input lines on whitespace"	2013-08-02 09:29:30 -07:00
check-attr.c	Merge branch 'sb/parseopt-boolean-removal'	2013-09-04 12:39:03 -07:00
check-ignore.c	Merge branch 'sb/parseopt-boolean-removal'	2013-09-04 12:39:03 -07:00
check-mailmap.c	builtin: add git-check-mailmap command	2013-07-13 10:19:37 -07:00
check-ref-format.c
checkout-index.c	checkout-index: fix negations of even numbers of -n	2013-08-07 08:37:02 -07:00
checkout.c	checkout: remove superfluous local variable	2013-08-05 11:32:19 -07:00
clean.c	Merge branch 'sb/parseopt-boolean-removal'	2013-09-04 12:39:03 -07:00
clone.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
column.c
commit-tree.c
commit.c	Merge branch 'sb/parseopt-boolean-removal'	2013-09-04 12:39:03 -07:00
config.c	config parsing options: allow one flag multiple times	2013-08-07 08:36:58 -07:00
count-objects.c
credential.c
describe.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
diff-files.c
diff-index.c
diff-tree.c
diff.c
fast-export.c	Merge branch 'sb/parseopt-boolean-removal'	2013-09-04 12:39:03 -07:00
fetch-pack.c	Merge branch 'jc/push-cas'	2013-09-09 14:30:29 -07:00
fetch.c	Merge branch 'ms/fetch-prune-configuration'	2013-09-09 14:27:11 -07:00
fmt-merge-msg.c
for-each-ref.c	for-each-ref, quote: convert *_quote_print -> *_quote_buf	2013-07-30 08:06:27 -07:00
fsck.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
gc.c	Merge branch 'sb/parseopt-boolean-removal'	2013-09-04 12:39:03 -07:00
grep.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
hash-object.c	hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP	2013-08-07 08:30:55 -07:00
help.c	Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint	2013-07-21 22:51:29 -07:00
index-pack.c
init-db.c
log.c	log, format-patch: parsing uses OPT__QUIET	2013-08-05 11:32:19 -07:00
ls-files.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
ls-remote.c
ls-tree.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
mailinfo.c
mailsplit.c
merge-base.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
merge-file.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
merge-index.c	Convert "struct cache_entry *" to "const ..." wherever possible	2013-07-09 09:12:48 -07:00
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
mktag.c
mktree.c
mv.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
name-rev.c	branch, commit, name-rev: ease up boolean conditions	2013-08-07 08:30:30 -07:00
notes.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
pack-objects.c	Don't close pack fd when free'ing pack windows	2013-08-02 09:27:26 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c
push.c	Merge branch 'jc/push-cas'	2013-09-09 14:30:29 -07:00
read-tree.c
receive-pack.c	cache.h: move remote/connect API out of it	2013-07-08 14:34:24 -07:00
reflog.c
remote-ext.c
remote-fd.c
remote.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
replace.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
rerere.c
reset.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
rev-list.c	pretty: --format output should honor logOutputEncoding	2013-06-26 11:40:31 -07:00
rev-parse.c	Merge branch 'sb/parseopt-boolean-removal'	2013-09-04 12:39:03 -07:00
revert.c	revert: use the OPT_CMDMODE for parsing, reducing code	2013-08-07 08:37:12 -07:00
rm.c	Merge branch 'sb/parseopt-boolean-removal'	2013-09-04 12:39:03 -07:00
send-pack.c	send-pack: fix parsing of --force-with-lease option	2013-08-02 16:07:45 -07:00
shortlog.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
show-branch.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
show-ref.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
stripspace.c
symbolic-ref.c
tag.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
tar-tree.c	tar-tree: remove dependency on sq_quote_print()	2013-07-30 08:10:35 -07:00
unpack-file.c
unpack-objects.c
update-index.c	Convert "struct cache_entry *" to "const ..." wherever possible	2013-07-09 09:12:48 -07:00
update-ref.c	Replace deprecated OPT_BOOLEAN by OPT_BOOL	2013-08-05 11:32:19 -07:00
update-server-info.c
upload-archive.c
var.c
verify-pack.c
verify-tag.c
write-tree.c