1 Subject: What's cooking in git.git (Aug 2008, #01; Tue, 05)
3 What's cooking in git.git (Aug 2008, #01; Tue, 05)
4 --------------------------------------------------
6 Here are the topics that have been cooking. Commits prefixed
7 with '-' are only in 'pu' while commits prefixed with '+' are
10 The topics list the commits in reverse chronological order. The topics
11 meant to be merged to the maintenance series have "maint-" in their names.
13 Due to increased activity level from people including GSoC students, I
14 expect 'next' to stay somewhat more active than previous rounds during the
15 1.6.0-rc cycle. The request for people who usually follow 'next' is the
16 same as usual, though. After -rc1 is tagged, please run 'master' for your
17 daily git use instead, in order to make sure 'master' does what it claims
18 to do without regression.
20 Tentative schedule, my wishful thinking:
25 ----------------------------------------------------------------
28 * jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits
29 + Topo-sort before --simplify-merges
30 + revision traversal: show full history with merge simplification
31 + revision.c: whitespace fix
33 "log --full-history" is with too much clutter, "log" itself is too cleverer
34 than some people, and here is the middle level of merge simplification.
36 * sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits
37 - [do not merge -- original version] Add Git-aware CGI for Git-aware
39 - Add backdoor options to receive-pack for use in Git-aware CGI
41 The "magic" detection protocol was revised to use POST to info/refs; the
42 top one queued is from before that discussion.
44 * jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits
45 - add: refuse to add working tree items beyond symlinks
46 - update-index: refuse to add working tree items beyond symlinks
48 The performance impact of this needs to be discussed in a separate
51 * dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits
52 + add --no-filters option to git hash-object
53 + add --path option to git hash-object
54 + use parse_options() in git hash-object
55 + correct usage help string for git-hash-object
56 + correct argument checking test for git hash-object
57 + teach index_fd to work with pipes
59 Gives a bit more flexibility to hash-objects by allowing us to lie about
60 the path the contents comes from.
62 * jn/svn-log (Sun Aug 3 14:07:21 2008 +0200) 1 commit
63 - git-svn: --clean-changelog=<style> to sanitize messages
65 Eric firmly rejected this one so I won't be merging this to 'next' but
66 this was an interesting firestarter for discussion nevertheless.
68 ----------------------------------------------------------------
69 [On Hold and/or Cooking]
71 * rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit
72 + archive: allow --exec and --remote without equal sign
74 None of the following is for 1.6.0.
76 * mv/merge-custom (Sat Aug 2 10:08:38 2008 +0200) 6 commits
78 + builtin-help: always load_command_list() in cmd_help()
79 + Add a second testcase for handling invalid strategies in git-merge
80 + Add a new test for using a custom merge strategy
81 + builtin-merge: allow using a custom strategy
82 + builtin-help: make some internal functions available to other
85 * cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits
86 - git-merge-octopus: use (merge-base A (merge B C D E...)) for
88 + merge-base-many: add trivial tests based on the documentation
89 + documentation: merge-base: explain "git merge-base" with more than
91 + merge-base: teach "git merge-base" to drive underlying
94 * rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
95 + Documentation: Improve documentation for git-imap-send(1)
96 + imap-send.c: more style fixes
97 + imap-send.c: style fixes
98 + git-imap-send: Support SSL
99 + git-imap-send: Allow the program to be run from subdirectories of
102 Some people seem to prefer having this feature available also with gnutls.
103 Such an enhancement can be done in-tree on top of this series if they are
106 * cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits
107 - bisect: only check merge bases when needed
108 - bisect: test merge base if good rev is not an ancestor of bad rev
110 The first one alone does not pass its self-test but combined together they
111 seem to. It does not build confidence as the latter one is supposed to be
112 an optimization only.
114 * jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits
115 + builtin-add.c: optimize -A option and "git add ."
116 + builtin-add.c: restructure the code for maintainability
118 * jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits
119 + spawn pager via run_command interface
120 + run-command: add pre-exec callback
122 This changes the parent-child relationship between the pager and the git
123 process. We used to make pager the parent which meant that the exit
124 status from git is lost from the caller.
126 * ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit
127 + Enable threaded delta search on *BSD and Linux.
129 * sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit
130 + merge: remove deprecated summary and diffstat options and config
133 This was previously in "will be in master soon" category, but it turns out
134 that the synonyms to the ones this one deletes are fairly new invention
135 that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
138 * jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
139 + Revert "Make clients ask for "git program" over ssh and local
141 + Make clients ask for "git program" over ssh and local transport
143 This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0
146 * jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
147 . diff: enable "too large a rename" warning when -M/-C is explicitly
150 This would be the right thing to do for command line use, but gitk will be
151 hit due to tcl/tk's limitation, so I am holding this back for now.