mirror of
https://github.com/git/git.git
synced 2026-01-20 22:07:19 +09:00
What's cooking (2009/06 #02)
This commit is contained in:
Junio C Hamano
parent
4b969b733a
commit
fb0c0446ad
@ -1,9 +1,9 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jun 2009, #01; Fri, 12)
|
||||
X-master-at: b8364903c3e4cde713102e4a36d3926b020b0f70
|
||||
X-next-at: f0de74fb063e75167a6c218a93cfeae5b8bdaaba
|
||||
Subject: What's cooking in git.git (Jun 2009, #02; Thu, 18)
|
||||
X-master-at: da4e4a65a27ca912c3f48289acf9ff7a67476c3f
|
||||
X-next-at: 04d09b6708a8fa33788706f00bbf43c80ea6af0e
|
||||
|
||||
What's cooking in git.git (Jun 2009, #01; Fri, 12)
|
||||
What's cooking in git.git (Jun 2009, #02; Thu, 18)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with '-' are
|
||||
@ -22,20 +22,57 @@ than I would have liked to give them. This message itself has more
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* tr/die_errno (Mon Jun 8 23:02:20 2009 +0200) 4 commits
|
||||
- Use die_errno() instead of die() when checking syscalls
|
||||
- Convert existing die(..., strerror(errno)) to die_errno()
|
||||
- die_errno(): double % in strerror() output just in case
|
||||
- Introduce die_errno() that appends strerror(errno) to die()
|
||||
* ne/maint-1.6.0-diff-tree-t-r-show-directory (Sat Jun 13 17:06:09 2009 -0700) 1 commit
|
||||
- diff-tree -r -t: include added/removed directories in the output
|
||||
|
||||
I didn't check the individual conversion from die() to die_errno()
|
||||
in this latest round; comments?
|
||||
* sb/maint-1.6.0-add-config-fix (Thu Jun 18 02:17:54 2009 -0700) 2 commits
|
||||
- add: allow configurations to be overriden by command line
|
||||
- use xstrdup, not strdup in ll-merge.c
|
||||
|
||||
* pb/maint-1.6.2-userdiff-fix (Wed Jun 17 12:11:10 2009 +0200) 2 commits
|
||||
- upload-archive: fix infinite loop on Cygwin
|
||||
- avoid exponential regex match for java and objc function names
|
||||
|
||||
* fc/user-manual (Fri May 1 11:44:20 2009 +0300) 2 commits
|
||||
. user-manual: use 'fast-forward' instead of 'fast forward'
|
||||
. user-manual: general quoting improvements
|
||||
|
||||
* uk/rev-parse-parse-opt (Sun Jun 14 01:58:43 2009 +0200) 2 commits
|
||||
- parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-
|
||||
parse
|
||||
- more tests for git rev-parse --parse-opt
|
||||
|
||||
* js/daemon-log (Tue Jun 16 20:41:16 2009 +0200) 2 commits
|
||||
- upload-pack: squelch progress indicator if client cannot see it
|
||||
- daemon: send stderr of service programs to the syslog
|
||||
|
||||
* sb/quiet-porcelains (Wed Jun 17 18:07:37 2009 -0700) 6 commits
|
||||
- stash: teach quiet option
|
||||
- am, rebase: teach quiet option
|
||||
- submodule, repack: migrate to git-sh-setup's say()
|
||||
- git-sh-setup: introduce say() for quiet options
|
||||
- am: suppress apply errors when using 3-way
|
||||
- t4150: test applying with a newline in subject
|
||||
|
||||
* lt/maint-unsigned-left-shift (Wed Jun 17 17:22:27 2009 -0700) 1 commit
|
||||
- Fix big left-shifts of unsigned char
|
||||
|
||||
* jk/use-our-regexp (Tue Jun 16 15:08:21 2009 -0400) 2 commits
|
||||
- Makefile: use compat regex on Solaris
|
||||
- Makefile: refactor regex compat support
|
||||
|
||||
* cb/maint-fetch-refspec-wo-dst (Wed Jun 17 15:38:36 2009 +0200) 1 commit
|
||||
- fetch: do not create ref from empty name
|
||||
|
||||
* pb/send-email-cccmd-fix (Thu Jun 18 14:31:32 2009 +0200) 1 commit
|
||||
- Test cccmd in t9001-send-email.sh and fix some bugs
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* cb/maint-no-double-merge (Mon Jun 1 11:20:56 2009 +0200) 1 commit
|
||||
+ refuse to merge during a merge
|
||||
|
||||
Will merge to 'master' soonish.
|
||||
|
||||
* sp/msysgit (Thu Jun 11 22:56:12 2009 +0200) 13 commits
|
||||
+ compat/ has subdirectories: do not omit them in 'make clean'
|
||||
+ Fix typo in nedmalloc warning fix
|
||||
@ -53,30 +90,16 @@ Will merge to 'master' soonish.
|
||||
+ Quiet make: do not leave Windows behind
|
||||
+ MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
|
||||
|
||||
A silly typo I failed to spot was fixed by J6t; should be ready for
|
||||
'master' now.
|
||||
|
||||
* mh/master-send-email (Sun Jun 7 23:40:52 2009 +0200) 8 commits
|
||||
- send-email: fix a typo in a comment
|
||||
- Merge branch 'mh/maint-send-email' into mh/master-send-email
|
||||
- Merge branch 'mh/master-send-email-threaded-fix' into mh/master-
|
||||
send-email
|
||||
- add a test for git-send-email for threaded mails without chain-
|
||||
reply-to
|
||||
- send-email: fix threaded mails without chain-reply-to
|
||||
- doc/send-email: clarify the behavior of --in-reply-to with --no-
|
||||
thread
|
||||
- send-email: fix non-threaded mails
|
||||
- add a test for git-send-email for non-threaded mails
|
||||
|
||||
The author seems to have a better organization than the way I queued this
|
||||
topic, so I am holding off merging it to 'next' yet. My goal was to have
|
||||
two topics, one eventually mergeable to 'maint', the other to 'master'.
|
||||
|
||||
* mn/maint-iconv-autoconf (Mon Jun 8 20:46:38 2009 -0700) 1 commit
|
||||
- fix handling of iconv configuration options
|
||||
|
||||
Will merge to 'next' soon.
|
||||
* mh/fix-send-email-threaded (Fri Jun 12 09:23:43 2009 -0700) 7 commits
|
||||
+ Merge branch 'mh/maint-fix-send-email-threaded' into
|
||||
mh/fix-send-email-threaded
|
||||
+ send-email: fix a typo in a comment
|
||||
+ send-email: fix threaded mails without chain-reply-to
|
||||
+ add a test for git-send-email for threaded mails without chain-reply-to
|
||||
+ doc/send-email: clarify the behavior of --in-reply-to with
|
||||
--no-thread
|
||||
+ send-email: fix non-threaded mails
|
||||
+ add a test for git-send-email for non-threaded mails
|
||||
|
||||
* rc/maint-http-local-slot-fix (Sat Jun 6 16:43:26 2009 +0800) 1 commit
|
||||
+ http*: cleanup slot->local after fclose
|
||||
@ -85,57 +108,8 @@ Will merge to 'next' soon.
|
||||
+ parse-options: simplify usage argh handling
|
||||
+ parse-options: make OPT_INTEGER's argh explicit
|
||||
|
||||
* sb/pull-rebase (Fri Jun 12 00:39:21 2009 +0200) 3 commits
|
||||
- parse-remote: remove unused functions
|
||||
- parse-remote: support default reflist in get_remote_merge_branch
|
||||
- parse-remote: function to get the tracking branch to be merge
|
||||
|
||||
Will merge to 'next' soon, but it would be nice if we can fix the
|
||||
"currently works only for the default mapping" before it goes to
|
||||
'master'.
|
||||
|
||||
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
|
||||
- Shift object enumeration out of upload-pack
|
||||
|
||||
* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits
|
||||
- http.c: add http.sslCertNoPass option
|
||||
- http.c: prompt for SSL client certificate password
|
||||
|
||||
I think "sslCertNoPass" is a mistake. We should aim for the ideal (i.e.
|
||||
detect when we do not need passphrase), and live with a configuration
|
||||
kludge until the code achives the ideal (i.e. "needPass" to trigger the
|
||||
new codepath to ask for passphrase), _if_ that ideal is achievable. And
|
||||
in this particular case, I think the ideal is not rocket science.
|
||||
|
||||
* mg/pushurl (Tue Jun 9 18:01:38 2009 +0200) 5 commits
|
||||
- builtin-remote: Make "remote -v" display push urls
|
||||
- builtin-remote: Show push urls as well
|
||||
- technical/api-remote: Describe new struct remote member pushurl
|
||||
- t5516: Check pushurl config setting
|
||||
- Allow push and fetch urls to be different
|
||||
|
||||
Will merge to 'next' soon.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit
|
||||
+ Documentation: teach stash/pop workflow instead of stash/apply
|
||||
|
||||
* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits
|
||||
+ diff: generate pretty filenames in prep_temp_blob()
|
||||
+ compat: add a basename() compatibility function
|
||||
+ compat: add a mkstemps() compatibility function
|
||||
|
||||
* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits
|
||||
+ Change xdl_merge to generate output even for null merges
|
||||
+ t6023: merge-file fails to output anything for a degenerate merge
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* bc/solaris (Sun Jun 7 07:40:29 2009 +0200) 10 commits
|
||||
- configure: test whether -lresolv is needed
|
||||
+ configure: test whether -lresolv is needed
|
||||
+ Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
|
||||
+ git-compat-util.h: avoid using c99 flex array feature with Sun
|
||||
compiler 5.8
|
||||
@ -151,11 +125,6 @@ Will merge to 'next' soon.
|
||||
+ Makefile: use /usr/ucb/install on SunOS platforms rather than
|
||||
ginstall
|
||||
|
||||
We saw some success report with Sun's c99 compiler, which would allow us
|
||||
to include the last remaining patch from Brandon with updates. I lost
|
||||
track of the status of the tip patch for autoconf. Is it ready to go?
|
||||
Comments from Solaris folks are appreciated.
|
||||
|
||||
* cb/match_refs_internal_tail (Sun May 31 16:26:48 2009 +0200) 1 commit
|
||||
+ match_refs: search ref list tail internally
|
||||
|
||||
@ -170,28 +139,9 @@ I think this makes sense, except that I have this nagging feeling that its
|
||||
use of for_each_rawref() where the original used for_each_ref() may have
|
||||
some unintended side effects in corner cases.
|
||||
|
||||
* ph/submodule-rebase (Wed Jun 3 00:59:12 2009 +0200) 3 commits
|
||||
- git-submodule: add support for --merge.
|
||||
+ Rename submodule.<name>.rebase to submodule.<name>.update
|
||||
+ git-submodule: add support for --rebase.
|
||||
|
||||
I think people do not have issues with the first two, even though some
|
||||
might still argue that "update --merge" is not a good mode of
|
||||
operation.
|
||||
|
||||
* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit
|
||||
+ mergetool--lib: add support for araxis merge
|
||||
|
||||
* cc/bisect (Sat Jun 6 06:41:35 2009 +0200) 5 commits
|
||||
+ t6030: test skipping away from an already skipped commit
|
||||
+ bisect: when skipping, choose a commit away from a skipped commit
|
||||
+ bisect: add parameters to "filter_skipped"
|
||||
+ bisect: display first bad commit without forking a new process
|
||||
+ bisect: drop unparse_commit() and use clear_commit_marks()
|
||||
|
||||
Regardless of metrics, this is an improvement from the current one. Will
|
||||
merge to 'master', and let the finer details taken care of later.
|
||||
|
||||
* rc/http-push (Sat Jun 6 16:44:02 2009 +0800) 24 commits
|
||||
+ http*: add helper methods for fetching objects (loose)
|
||||
+ http*: add helper methods for fetching packs
|
||||
@ -219,11 +169,36 @@ merge to 'master', and let the finer details taken care of later.
|
||||
+ Merge branch 'rc/maint-http-local-slot-fix' into rc/http-push
|
||||
+ http*: cleanup slot->local after fclose
|
||||
|
||||
I do not use http-push myself, and as I said, I have shortage of git time
|
||||
in recent weeks, so these are not as carefully reviewed as usual; but
|
||||
RCTay is proving to be a very reliable HTTP guy I can trust, so unless
|
||||
there are regression reports from people who actually use http-push, this
|
||||
will be in 'master' soon.
|
||||
* cc/bisect (Sat Jun 6 06:41:35 2009 +0200) 5 commits
|
||||
+ t6030: test skipping away from an already skipped commit
|
||||
+ bisect: when skipping, choose a commit away from a skipped commit
|
||||
+ bisect: add parameters to "filter_skipped"
|
||||
+ bisect: display first bad commit without forking a new process
|
||||
+ bisect: drop unparse_commit() and use clear_commit_marks()
|
||||
|
||||
Regardless of metrics, this is an improvement from the current one. Will
|
||||
merge to 'master', and let the finer details taken care of later, which
|
||||
is already happening.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* ph/submodule-rebase (Wed Jun 3 00:59:12 2009 +0200) 1 commit
|
||||
+ git-submodule: add support for --merge.
|
||||
|
||||
Even though some might still argue that "update --merge" is not a good
|
||||
mode of operation.
|
||||
|
||||
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
|
||||
+ Avoid "diff-index --cached" optimization under --find-copies-
|
||||
harder
|
||||
+ Optimize "diff-index --cached" using cache-tree
|
||||
+ t4007: modernize the style
|
||||
+ cache-tree.c::cache_tree_find(): simplify internal API
|
||||
+ write-tree --ignore-cache-tree
|
||||
|
||||
* mn/maint-iconv-autoconf (Mon Jun 8 20:46:38 2009 -0700) 1 commit
|
||||
+ fix handling of iconv configuration options
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Stalled and may need help and prodding to go forward]
|
||||
@ -307,25 +282,64 @@ in binary mode as well.
|
||||
----------------------------------------------------------------
|
||||
[Actively cooking]
|
||||
|
||||
* tr/die_errno (Fri Jun 12 09:00:59 2009 -0700) 5 commits
|
||||
- DONTMERGE fix double per-cent
|
||||
- Use die_errno() instead of die() when checking syscalls
|
||||
- Convert existing die(..., strerror(errno)) to die_errno()
|
||||
- die_errno(): double % in strerror() output just in case
|
||||
- Introduce die_errno() that appends strerror(errno) to die()
|
||||
|
||||
I didn't check the individual conversion from die() to die_errno()
|
||||
in this latest round; comments?
|
||||
|
||||
Thomas found issues in my "double per-cent hack", so this cannot be merged
|
||||
to yet until either it is fixed up, or drop the "double per-cent" attempt
|
||||
altogether.
|
||||
|
||||
* sb/pull-rebase (Fri Jun 12 00:39:21 2009 +0200) 3 commits
|
||||
+ parse-remote: remove unused functions
|
||||
+ parse-remote: support default reflist in get_remote_merge_branch
|
||||
+ parse-remote: function to get the tracking branch to be merge
|
||||
|
||||
It would be nice if we can fix the "currently works only for the default
|
||||
mapping" before it goes to 'master'. I looked at, but haven't queued any
|
||||
of the recent RFC updates here.
|
||||
|
||||
* ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit
|
||||
- Shift object enumeration out of upload-pack
|
||||
|
||||
* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits
|
||||
- http.c: add http.sslCertPasswordProtected option
|
||||
- http.c: prompt for SSL client certificate password
|
||||
|
||||
I've rewritten these two to (1) move the #ifdef out of the main codepath,
|
||||
and (2) use configuration/environment to make the misfeature of always
|
||||
asking for a passphrase even a key/cert is unencrypted optional. I tried
|
||||
to be careful but extra sets of eyeballs would be nice to check the result.
|
||||
|
||||
* mg/pushurl (Sun Jun 14 21:46:10 2009 +0200) 6 commits
|
||||
+ avoid NULL dereference on failed malloc
|
||||
+ builtin-remote: Make "remote -v" display push urls
|
||||
+ builtin-remote: Show push urls as well
|
||||
+ technical/api-remote: Describe new struct remote member pushurl
|
||||
+ t5516: Check pushurl config setting
|
||||
+ Allow push and fetch urls to be different
|
||||
|
||||
* cc/bisect (Sat Jun 13 13:11:02 2009 +0200) 2 commits
|
||||
- Documentation: remove warning saying that "git bisect skip" may
|
||||
slow bisection
|
||||
- bisect: use a PRNG with a bias when skipping away from untestable
|
||||
commits
|
||||
|
||||
Will be in 'next' shortly.
|
||||
|
||||
* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits
|
||||
- git-am: refactor 'cleaning up and aborting'
|
||||
- git-am foreign patch support: StGIT support
|
||||
- git-am foreign patch support: autodetect some patch formats
|
||||
- git-am foreign patch support: introduce patch_format
|
||||
|
||||
Should re-review and merge to 'next' but I am short of time these days.
|
||||
|
||||
* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits
|
||||
+ Avoid "diff-index --cached" optimization under --find-copies-
|
||||
harder
|
||||
+ Optimize "diff-index --cached" using cache-tree
|
||||
+ t4007: modernize the style
|
||||
+ cache-tree.c::cache_tree_find(): simplify internal API
|
||||
+ write-tree --ignore-cache-tree
|
||||
|
||||
I believe the code is right, but this touches a very low-level code with
|
||||
high chance of subtle breakages unless you are really careful. I'll let
|
||||
it simmer a bit longer in 'next'.
|
||||
Will be in 'next' shortly.
|
||||
|
||||
* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
|
||||
- diff: Rename QUIET internal option to QUICK
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user