|
|
@ -1,9 +1,9 @@ |
|
|
|
To: git@vger.kernel.org |
|
|
|
To: git@vger.kernel.org |
|
|
|
Subject: What's cooking in git.git (Jan 2012, #02; Mon, 9) |
|
|
|
Subject: What's cooking in git.git (Jan 2012, #03; Wed, 11) |
|
|
|
X-master-at: beecc7ab65b31c5471331e64acaa3f722125ea67 |
|
|
|
X-master-at: 0e1cfc52de002e2d9b0e6562e8672fee3bf45a67 |
|
|
|
X-next-at: 6c3c759d2442c2dca37be91f899570e1396d5bd5 |
|
|
|
X-next-at: 5c0bfa96c2f67a7ac76afe5096f622dced39734f |
|
|
|
|
|
|
|
|
|
|
|
What's cooking in git.git (Jan 2012, #02; Mon, 9) |
|
|
|
What's cooking in git.git (Jan 2012, #03; Wed, 11) |
|
|
|
-------------------------------------------------- |
|
|
|
-------------------------------------------------- |
|
|
|
|
|
|
|
|
|
|
|
Here are the topics that have been cooking. Commits prefixed with '-' are |
|
|
|
Here are the topics that have been cooking. Commits prefixed with '-' are |
|
|
@ -38,97 +38,83 @@ The preformatted documentation in HTML and man format are found in: |
|
|
|
-------------------------------------------------- |
|
|
|
-------------------------------------------------- |
|
|
|
[New Topics] |
|
|
|
[New Topics] |
|
|
|
|
|
|
|
|
|
|
|
* rs/diff-postimage-in-context (2012-01-06) 1 commit |
|
|
|
* jc/pull-signed-tag (2012-01-11) 1 commit |
|
|
|
(merged to 'next' on 2012-01-09 at 9635032) |
|
|
|
- merge: use editor by default in interactive sessions |
|
|
|
+ xdiff: print post-image for common records instead of pre-image |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Looked reasonable. |
|
|
|
Per Linus's strong suggestion, sugarcoated (aka "taking blame for the |
|
|
|
|
|
|
|
original UI screw-ups") so that it is easier for me to swallow and accept |
|
|
|
|
|
|
|
a potentially huge backward incompatibility issue, "git merge" is made to |
|
|
|
|
|
|
|
launch an editor to explain the merge in the merge commit by default in |
|
|
|
|
|
|
|
interactive sessions. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* jc/request-pull-show-head-4 (2012-01-10) 1 commit |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-11 at 8d98a6b) |
|
|
|
|
|
|
|
+ request-pull: use the real fork point when preparing the message |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Hopefully the final finishing touch to the request-pull script that was |
|
|
|
|
|
|
|
updated during this cycle. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Will merge by 1.7.9-rc1. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* jk/maint-upload-archive (2012-01-11) 1 commit |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-11 at 5c0bfa9) |
|
|
|
|
|
|
|
+ archive: re-allow HEAD:Documentation on a remote invocation |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Running "git archive" remotely and asking for a partial tree of a ref, |
|
|
|
|
|
|
|
e.g. HEAD:$path was forbidden by a recent change to tighten security, but |
|
|
|
|
|
|
|
was found to be overly restrictive. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Will merge by 1.7.9-rc1. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* nd/commit-ignore-i-t-a (2012-01-11) 2 commits |
|
|
|
|
|
|
|
- commit: add --skip-intent-to-add to allow commit with i-t-a entries in index |
|
|
|
|
|
|
|
- cache-tree: update API to take abitrary flags |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* nd/maint-refname-in-hierarchy-check (2012-01-11) 1 commit |
|
|
|
|
|
|
|
- Fix incorrect ref namespace check |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Avoid getting confused by "ref/headxxx" and mistaking it as if it is under |
|
|
|
|
|
|
|
the "refs/heads/" hierarchy. |
|
|
|
Not urgent. |
|
|
|
Not urgent. |
|
|
|
|
|
|
|
|
|
|
|
* cb/push-quiet (2012-01-08) 3 commits |
|
|
|
* rr/sequencer (2012-01-11) 2 commits |
|
|
|
- t5541: avoid TAP test miscounting |
|
|
|
- sequencer: factor code out of revert builtin |
|
|
|
- fix push --quiet: add 'quiet' capability to receive-pack |
|
|
|
- revert: prepare to move replay_action to header |
|
|
|
- server_supports(): parse feature list more carefully |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Looked reasonable. |
|
|
|
Moving large chunk of code out of cherry-pick/revert for later reuse, |
|
|
|
|
|
|
|
primarily to prepare for the next cycle. |
|
|
|
Not urgent. |
|
|
|
Not urgent. |
|
|
|
|
|
|
|
|
|
|
|
* nd/clone-detached (2012-01-08) 6 commits |
|
|
|
* ss/maint-msys-cvsexportcommit (2012-01-11) 2 commits |
|
|
|
- clone: print advice on checking out detached HEAD |
|
|
|
(merged to 'next' on 2012-01-11 at 007aab1) |
|
|
|
- clone: allow --branch to take a tag |
|
|
|
+ git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS |
|
|
|
- clone: --branch=<branch> always means refs/heads/<branch> |
|
|
|
+ t9200: On MSYS, do not pass Windows-style paths to CVS |
|
|
|
- clone: factor out checkout code |
|
|
|
|
|
|
|
- clone: write detached HEAD in bare repositories |
|
|
|
|
|
|
|
- t5601: add missing && cascade |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
I am not sure what the benefit of this is. |
|
|
|
Will merge by 1.7.9-rc1. |
|
|
|
|
|
|
|
|
|
|
|
* nd/clone-single-branch (2012-01-08) 1 commit |
|
|
|
* tr/maint-mailinfo (2012-01-11) 1 commit |
|
|
|
(merged to 'next' on 2012-01-09 at 6c3c759) |
|
|
|
(merged to 'next' on 2012-01-11 at d9e344a) |
|
|
|
+ clone: add --single-branch to fetch only one branch |
|
|
|
+ mailinfo documentation: accurately describe non -k case |
|
|
|
|
|
|
|
|
|
|
|
Looked reasonable. |
|
|
|
Will merge by 1.7.9-rc1. |
|
|
|
Not urgent. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* jn/gitweb-unspecified-action (2012-01-09) 1 commit |
|
|
|
* jk/credentials (2012-01-11) 3 commits |
|
|
|
- gitweb: Fix actionless dispatch for non-existent objects |
|
|
|
- unix-socket: do not let close() or chdir() clobber errno during cleanup |
|
|
|
|
|
|
|
- credential-cache: report more daemon connection errors |
|
|
|
|
|
|
|
- unix-socket: handle long socket pathnames |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* pw/p4-view-updates (2012-01-11) 5 commits |
|
|
|
|
|
|
|
- git-p4: add tests demonstrating spec overlay ambiguities |
|
|
|
|
|
|
|
- git-p4: adjust test to adhere to stricter useClientSpec |
|
|
|
|
|
|
|
- git-p4: clarify comment |
|
|
|
|
|
|
|
- git-p4: fix verbose comment typo |
|
|
|
|
|
|
|
- git-p4: only a single ... wildcard is supported |
|
|
|
|
|
|
|
|
|
|
|
-------------------------------------------------- |
|
|
|
-------------------------------------------------- |
|
|
|
[Graduated to "master"] |
|
|
|
[Graduated to "master"] |
|
|
|
|
|
|
|
|
|
|
|
* jc/show-sig (2012-01-05) 6 commits |
|
|
|
* bw/maint-t8006-sed-incomplete-line (2012-01-03) 1 commit |
|
|
|
(merged to 'next' on 2012-01-05 at 5da3ae2) |
|
|
|
+ Work around sed portability issue in t8006-blame-textconv |
|
|
|
+ log --show-signature: reword the common two-head merge case |
|
|
|
|
|
|
|
+ log-tree: show mergetag in log --show-signature output |
|
|
|
|
|
|
|
+ log-tree.c: small refactor in show_signature() |
|
|
|
|
|
|
|
+ commit --amend -S: strip existing gpgsig headers |
|
|
|
|
|
|
|
+ verify_signed_buffer: fix stale comment |
|
|
|
|
|
|
|
+ Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag' |
|
|
|
|
|
|
|
(this branch uses jc/signed-commit.) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Finishing touches to the already graduated "pull signed tags" topic. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* jc/signed-commit (2011-11-29) 5 commits |
|
|
|
|
|
|
|
(merged to 'next' on 2011-12-21 at 8fcbf00) |
|
|
|
|
|
|
|
+ gpg-interface: allow use of a custom GPG binary |
|
|
|
|
|
|
|
+ pretty: %G[?GS] placeholders |
|
|
|
|
|
|
|
+ test "commit -S" and "log --show-signature" |
|
|
|
|
|
|
|
+ log: --show-signature |
|
|
|
|
|
|
|
+ commit: teach --gpg-sign option |
|
|
|
|
|
|
|
(this branch is used by jc/show-sig.) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* jh/fetch-head-update (2012-01-03) 1 commit |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-04 at b5778e1) |
|
|
|
|
|
|
|
+ write first for-merge ref to FETCH_HEAD first |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* jk/credentials (2012-01-08) 1 commit |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-08 at 48766c9) |
|
|
|
|
|
|
|
+ credentials: unable to connect to cache daemon |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* jm/stash-diff-disambiguate (2012-01-01) 1 commit |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-05 at 75a283b) |
|
|
|
|
|
|
|
+ stash: Don't fail if work dir contains file named 'HEAD' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* mh/ref-api-less-extra-refs (2012-01-06) 3 commits |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-06 at 3105696) |
|
|
|
|
|
|
|
+ write_head_info(): handle "extra refs" locally |
|
|
|
|
|
|
|
+ show_ref(): remove unused "flag" and "cb_data" arguments |
|
|
|
|
|
|
|
+ receive-pack: move more work into write_head_info() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* mm/maint-gitweb-project-maxdepth (2012-01-04) 1 commit |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-06 at bcf3818) |
|
|
|
|
|
|
|
+ gitweb: accept trailing "/" in $project_list |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Looked quite sensible. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* pw/p4-view-updates (2012-01-03) 6 commits |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-03 at c3b5872) |
|
|
|
|
|
|
|
+ git-p4: view spec documentation |
|
|
|
|
|
|
|
+ git-p4: rewrite view handling |
|
|
|
|
|
|
|
+ git-p4: support single file p4 client view maps |
|
|
|
|
|
|
|
+ git-p4: sort client views by reverse View number |
|
|
|
|
|
|
|
+ git-p4: fix test for unsupported P4 Client Views |
|
|
|
|
|
|
|
+ git-p4: test client view handling |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-------------------------------------------------- |
|
|
|
-------------------------------------------------- |
|
|
|
[Stalled] |
|
|
|
[Stalled] |
|
|
@ -168,6 +154,50 @@ should never be translated. |
|
|
|
-------------------------------------------------- |
|
|
|
-------------------------------------------------- |
|
|
|
[Cooking] |
|
|
|
[Cooking] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* rs/diff-postimage-in-context (2012-01-06) 1 commit |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-09 at 9635032) |
|
|
|
|
|
|
|
+ xdiff: print post-image for common records instead of pre-image |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Looked reasonable. |
|
|
|
|
|
|
|
Not urgent. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* cb/push-quiet (2012-01-08) 3 commits |
|
|
|
|
|
|
|
- t5541: avoid TAP test miscounting |
|
|
|
|
|
|
|
- fix push --quiet: add 'quiet' capability to receive-pack |
|
|
|
|
|
|
|
- server_supports(): parse feature list more carefully |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Looked reasonable. |
|
|
|
|
|
|
|
Not urgent. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* nd/clone-detached (2012-01-11) 11 commits |
|
|
|
|
|
|
|
- clone: print advice on checking out detached HEAD |
|
|
|
|
|
|
|
- clone: allow --branch to take a tag |
|
|
|
|
|
|
|
- clone: refuse to clone if --branch points to bogus ref |
|
|
|
|
|
|
|
- clone: --branch=<branch> always means refs/heads/<branch> |
|
|
|
|
|
|
|
- fixup! acd8f20 |
|
|
|
|
|
|
|
- clone: delay cloning until after remote HEAD checking |
|
|
|
|
|
|
|
- clone: factor out remote ref writing |
|
|
|
|
|
|
|
- clone: factor out HEAD update code |
|
|
|
|
|
|
|
- clone: factor out checkout code |
|
|
|
|
|
|
|
- clone: write detached HEAD in bare repositories |
|
|
|
|
|
|
|
- t5601: add missing && cascade |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Looking good, but I may have screwed up the merge of this into 'pu'. |
|
|
|
|
|
|
|
Not urgent. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* nd/clone-single-branch (2012-01-08) 1 commit |
|
|
|
|
|
|
|
(merged to 'next' on 2012-01-09 at 6c3c759) |
|
|
|
|
|
|
|
+ clone: add --single-branch to fetch only one branch |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Looked reasonable. |
|
|
|
|
|
|
|
Not urgent. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* jn/gitweb-unspecified-action (2012-01-09) 1 commit |
|
|
|
|
|
|
|
- gitweb: Fix actionless dispatch for non-existent objects |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Looked reasonable. |
|
|
|
|
|
|
|
Not urgent. |
|
|
|
|
|
|
|
|
|
|
|
* nd/index-pack-no-recurse (2012-01-09) 3 commits |
|
|
|
* nd/index-pack-no-recurse (2012-01-09) 3 commits |
|
|
|
- index-pack: eliminate unlimited recursion in get_delta_base() |
|
|
|
- index-pack: eliminate unlimited recursion in get_delta_base() |
|
|
|
- index-pack: eliminate recursion in find_unresolved_deltas |
|
|
|
- index-pack: eliminate recursion in find_unresolved_deltas |
|
|
@ -176,10 +206,7 @@ should never be translated. |
|
|
|
The first one looked sensible; I am not sure if the second and third ones |
|
|
|
The first one looked sensible; I am not sure if the second and third ones |
|
|
|
take the right approach. |
|
|
|
take the right approach. |
|
|
|
|
|
|
|
|
|
|
|
* bw/maint-t8006-sed-incomplete-line (2012-01-03) 1 commit |
|
|
|
Will defer till the next cycle. |
|
|
|
- Work around sed portability issue in t8006-blame-textconv |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Waiting for a clarification of the reasoning in the log message. |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* mh/ref-api-rest (2011-12-12) 35 commits |
|
|
|
* mh/ref-api-rest (2011-12-12) 35 commits |
|
|
|
- repack_without_ref(): call clear_packed_ref_cache() |
|
|
|
- repack_without_ref(): call clear_packed_ref_cache() |
|
|
|