@ -190,14 +246,40 @@ I think a further refactoring (no, not my suggestion) was offered?
@@ -190,14 +246,40 @@ I think a further refactoring (no, not my suggestion) was offered?
- consolidate pathspec_prefix and common_prefix
- remove prefix argument from pathspec_prefix
Will merge to "next" after squashing the tip one into "consolidate" patch.
* cb/send-email-help (2011-09-05) 1 commit
- send-email: add option -h
I think we should further amend to drop the fully-spelled "help" that will
be intercepted by "git" wrapper before moving this forward.
A separate set of patches to remove the hidden fully-spelled "help" from
other commands would be nice to have as companion patches as well.
We had an option to verify the sent objects before accepting a push but
lacked the corresponding option when fetching. In the light of the recent
k.org incident, a change like this would be a good addition.
Will merge to "next" to cook for more.
* jc/fetch-verify (2011-09-01) 3 commits
- fetch: verify we have everything we need before updating our ref
- rev-list --verify-object
- list-objects: pass callback data to show_objects()
(this branch uses jc/traverse-commit-list; is tangled with jc/receive-verify.)
During a fetch, we verify that the pack stream is self consistent,
but did not verify that the refs that are updated are consistent with
objects contained in the packstream, and this adds such a check.
Will merge to "next" to cook for more.
* jc/receive-verify (2011-09-09) 6 commits
- receive-pack: check connectivity before concluding "git push"
- check_everything_connected(): libify
@ -205,20 +287,25 @@ I think a further refactoring (no, not my suggestion) was offered?
@@ -205,20 +287,25 @@ I think a further refactoring (no, not my suggestion) was offered?
- fetch: verify we have everything we need before updating our ref
- rev-list --verify-object
- list-objects: pass callback data to show_objects()
(this branch uses jc/traverse-commit-list; is tangled with jc/fetch-verify and jc/fetch-verify.)
(this branch uses jc/traverse-commit-list; is tangled with jc/fetch-verify.)
* tr/doc-note-rewrite (2011-09-05) 1 commit
- Documentation: "on for all" configuration of notes.rewriteRef
While accepting a push, we verify that the pack stream is self consistent,
but did not verify that the refs the push updates are consistent with
objects contained in the packstream, and this adds such a check.
It was questioned if the new text suggests a sane and safe thing to do.
- http: avoid empty error messages for some curl errors
- http: remove extra newline in error message
Will merge to "next".
* bk/ancestry-path (2011-08-25) 3 commits
(merged to 'next' on 2011-09-02 at d05ba5d)
+ revision: do not include sibling history in --ancestry-path output
@ -247,11 +334,6 @@ Not urgent; the topic came up a bit too late in the cycle.
@@ -247,11 +334,6 @@ Not urgent; the topic came up a bit too late in the cycle.
Not urgent; the topic came up a bit too late in the cycle.
* jk/default-attr (2011-08-26) 1 commit
- attr: map builtin userdiff drivers to well-known extensions
Not urgent; I fixed up the test breakage just for fun.
- submodule: Search for merges only at end of recursive merge
- allow multiple calls to submodule merge search for the same path
@ -261,8 +343,9 @@ Not urgent; I fixed up the test breakage just for fun.
@@ -261,8 +343,9 @@ Not urgent; I fixed up the test breakage just for fun.
+ push: teach --recurse-submodules the on-demand option
(this branch is tangled with fg/submodule-auto-push.)
Not urgent; the topic came up a bit too late in the cycle.
The bottom one needs to be replaced with a properly written commit log message.
Not urgent; the topic came up a bit too late in the cycle. The second
from the bottom one needs to be replaced with a properly written commit
log message.
* mm/mediawiki-as-a-remote (2011-09-01) 2 commits
- git-remote-mediawiki: allow push to set MediaWiki metadata
@ -271,14 +354,6 @@ The bottom one needs to be replaced with a properly written commit log message.
@@ -271,14 +354,6 @@ The bottom one needs to be replaced with a properly written commit log message.
Fun.
Not urgent; the topic came up a bit too late in the cycle.
+ git-stash: remove untracked/ignored directories when stashed
@ -309,13 +384,6 @@ Not urgent; the topic came up a bit too late in the cycle.
@@ -309,13 +384,6 @@ Not urgent; the topic came up a bit too late in the cycle.
Will cook for a while.
* jn/remote-helpers-doc (2011-09-01) 3 commits
- (short) documentation for the testgit remote helper
- Documentation/git-remote-helpers: explain how import works with multiple refs
- Documentation/remote-helpers: explain capabilities first
Not urgent.
* nm/grep-object-sha1-lock (2011-08-30) 1 commit
(merged to 'next' on 2011-09-02 at 336f57d)
+ grep: Fix race condition in delta_base_cache
@ -338,17 +406,6 @@ Not urgent; the topic came up a bit too late in the cycle.
@@ -338,17 +406,6 @@ Not urgent; the topic came up a bit too late in the cycle.
What the topic aims to achieve may make sense, but the implementation
looked somewhat suboptimal.
* jc/fetch-verify (2011-09-01) 3 commits
- fetch: verify we have everything we need before updating our ref
- rev-list --verify-object
- list-objects: pass callback data to show_objects()
(this branch uses jc/traverse-commit-list; is tangled with jc/receive-verify and jc/receive-verify.)
Make "git fetch" verify what it received a bit more carefully before
updating the refs in the receiving end.
Not urgent; the topic came up a bit too late in the cycle.
* jc/traverse-commit-list (2011-08-22) 3 commits
(merged to 'next' on 2011-08-24 at df50dd7)
+ revision.c: update show_object_with_name() without using malloc()
Junio C Hamano
14 years ago