What's cooking (2012/04 #10)
Junio C Hamano committed
Apr 26, 2012 at 13:34 UTC
6361615559809fcccc54a253fb12d24bcc594e95
1 file changed
+244
-274
whats-cooking.txt
+244
-274
@@ -1,15 +1,18 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2012, #09; Mon, 23)
3
-X-master-at: aa39b858a35d99135e1403575a358b97d26ff466
4
-X-next-at: 8de07476bf9d007657eaa0b87f26678540e92092
2
+Subject: What's cooking in git.git (Apr 2012, #10; Thu, 26)
3
+X-master-at: 010b260e6f23b8964ef53b989e1c1baa8973edbe
4
+X-next-at: 9919198d495ad46119f57aec159ea212bd584242
5
6
-What's cooking in git.git (Apr 2012, #09; Mon, 23)
6
+What's cooking in git.git (Apr 2012, #10; Thu, 26)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-The fourth batch of topics in this cycle is now in 'master'.
12
+The fifth batch of topics in this cycle is now in 'master'. I also
13
+merged accumulated fixes that have been in 'master' since v1.7.10 to
14
+'maint', so that we can issue the first maintenance release sometime
15
+next week.
16
17
You can find the changes described here in the integration branches of the
18
repositories listed at
@@ -19,147 +22,202 @@ repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
22
-* bw/test-fix-grep-gnuism (2012-04-19) 1 commit
23
- (merged to 'next' on 2012-04-20 at ee7eec4)
24
- + t9400: fix gnuism in grep
25
-
26
-Fix two places that were the only place in the test suite that gave "a\+"
27
-to platform grep and expected it to mean one or more "a", which is a
28
-blatant GNUism.
29
-
30
-* jc/maint-blame-minimal (2012-04-11) 1 commit
31
- (merged to 'next' on 2012-04-20 at 2213284)
32
- + blame: accept --need-minimal
33
-
34
-"git blame" started missing quite a few changes from the origin since we
35
-stopped using the diff minimalization by default in v1.7.2 era.
36
-
37
-* jh/apply-free-patch (2012-04-11) 9 commits
38
- (merged to 'next' on 2012-04-15 at 8cccf57)
39
- + apply: document buffer ownership rules across functions
40
- + apply: tighten constness of line buffer
41
- + apply: drop unused macro
42
- + apply: free unused fragments for submodule patch
43
- + apply: free patch->result
44
- + apply: release memory for fn_table
45
- + apply: free patch->{def,old,new}_name fields
46
- + apply: rename free_patch() to free_patch_list()
47
- + apply: do not leak patches and fragments
48
-
49
-Valgrind reports quite a lot of discarded memory inside apply.
50
-
51
-* jk/rebase-i-submodule-conflict-only (2012-04-09) 1 commit
52
- (merged to 'next' on 2012-04-15 at 94367a8)
53
- + rebase -i continue: don't skip commits that only change submodules
54
-
55
-Giving "--continue" to a conflicted "rebase -i" session skipped a commit
56
-that only results in changes to submodules.
57
-
58
-* jl/maint-submodule-recurse-fetch (2012-04-14) 1 commit
59
- (merged to 'next' on 2012-04-20 at 2769d39)
60
- + submodules: recursive fetch also checks new tags for submodule commits
61
-
62
-* jn/debian-customizes-default-editor (2012-04-10) 2 commits
63
- (merged to 'next' on 2012-04-15 at 0fc85c3)
64
- + var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
65
- + var doc: default editor and pager are configurable at build time
66
-
67
-* jn/fast-import-doc (2012-04-15) 1 commit
68
- (merged to 'next' on 2012-04-20 at b9a7250)
69
- + fast-import doc: cat-blob and ls responses need to be consumed quickly
70
-
71
-* jn/more-i18ncmp (2012-04-14) 3 commits
72
- (merged to 'next' on 2012-04-20 at b5548a3)
73
- + test: am of empty patch should not succeed
74
- + test: use test_i18ncmp for "Patch format detection failed" message
75
- + test: do not rely on US English tracking-info messages
76
-
77
-* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
78
- (merged to 'next' on 2012-04-20 at b6cf0ff)
79
- + t4202: add test for "log --graph --stat -p" separator lines
80
- + log --graph: fix break in graph lines
81
- + log --graph --stat: three-dash separator should come after graph lines
82
-
83
-* ms/remote-usage-string (2012-04-09) 1 commit
84
- (merged to 'next' on 2012-04-15 at 704be8f)
85
- + remote: update builtin usage
86
-
87
-As an independent follow-up, we may want to rethink how the overall usage
88
-string and subcommand usage strings are maintained.
89
-
90
-* pw/git-p4 (2012-04-09) 3 commits
91
- (merged to 'next' on 2012-04-15 at 81ea41a)
92
- + git p4: use "git p4" directly in tests
93
- + git p4: update name in script
94
- + git-p4: move to toplevel
95
- (this branch is used by ld/git-p4-tags-and-labels.)
96
-
97
-* rj/mingw-isguid (2012-04-18) 1 commit
98
- (merged to 'next' on 2012-04-20 at 9dbebca)
99
- + compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
100
-
101
-* rj/sh-setup-mswin-pwd (2012-04-18) 1 commit
102
- (merged to 'next' on 2012-04-20 at 6125f8d)
103
- + git-sh-setup.sh: Add an pwd() function for MinGW
104
-
105
-* rj/submodule-mswin-path (2012-04-18) 1 commit
106
- (merged to 'next' on 2012-04-20 at fd9f8b3)
107
- + git-submodule.sh: Don't use $path variable in eval_gettext string
108
-
109
-* rl/show-empty-prefix (2012-04-10) 1 commit
110
- (merged to 'next' on 2012-04-15 at b2e5938)
111
- + rev-parse --show-prefix: add in trailing newline
112
-
113
-* rs/commit-list-sort-in-batch (2012-04-17) 4 commits
114
- (merged to 'next' on 2012-04-17 at 21208e9)
115
- + mergesort: rename it to llist_mergesort()
116
- (merged to 'next' on 2012-04-15 at 39fe527)
117
- + revision: insert unsorted, then sort in prepare_revision_walk()
118
- + commit: use mergesort() in commit_list_sort_by_date()
119
- + add mergesort() for linked lists
120
-
121
-* sl/test-wc-l-line-count (2012-04-11) 1 commit
122
- (merged to 'next' on 2012-04-15 at 40797d9)
123
- + tests: modernise style: more uses of test_line_count
124
-
125
---------------------------------------------------
126
-[New Topics]
127
-
25
* cc/fix-missing-va-end-in-revert (2012-04-21) 1 commit
26
(merged to 'next' on 2012-04-23 at b90eb70)
27
+ revert: add missing va_end
28
132
-Will merge to 'master'.
29
+* fc/completion-tests (2012-04-21) 7 commits
30
+ (merged to 'next' on 2012-04-23 at 9b42326)
31
+ + completion: fix completion after 'git --option <TAB>'
32
+ + completion: avoid trailing space for --exec-path
33
+ + completion: add missing general options
34
+ + completion: simplify by using $prev
35
+ + completion: simplify __gitcomp_1
36
+ + tests: add tests for the __gitcomp() completion helper function
37
+ + tests: add initial bash completion tests
38
+
39
+* hv/submodule-recurse-push (2012-03-30) 3 commits
40
+ (merged to 'next' on 2012-04-20 at fe99e3d)
41
+ + push: teach --recurse-submodules the on-demand option
42
+ + Refactor submodule push check to use string list instead of integer
43
+ + Teach revision walking machinery to walk multiple times sequencially
44
+
45
+"git push --recurse-submodules" learns to optionally look into the
46
+histories of submodules bound to the superproject and push them out.
47
+
48
+* it/fetch-pack-many-refs (2012-04-10) 4 commits
49
+ (merged to 'next' on 2012-04-20 at e2126d7)
50
+ + remote-curl: main test case for the OS command line overflow
51
+ + fetch-pack: test cases for the new --stdin option
52
+ + remote-curl: send the refs to fetch-pack on stdin
53
+ + fetch-pack: new --stdin option to read refs from stdin
54
+
55
+When "git fetch" encounters repositories with too many references, the
56
+command line of "fetch-pack" that is run by a helper e.g. remote-curl,
57
+may fail to hold all of them. Now such an internal invocation can feed
58
+the references through the standard input of "fetch-pack".
59
+
60
+* jm/maint-strncpy-diff-no-index (2012-04-16) 1 commit
61
+ (merged to 'next' on 2012-04-20 at 638ed9f)
62
+ + diff: avoid stack-buffer-read-overrun for very long name
63
+
64
+* mb/fetch-call-a-non-branch-a-ref (2012-04-17) 2 commits
65
+ (merged to 'next' on 2012-04-20 at df2c57e)
66
+ + fetch: describe new refs based on where it came from
67
+ + fetch: Give remote_ref to update_local_ref() as well
68
+
69
+* mh/ref-api (2012-04-10) 13 commits
70
+ (merged to 'next' on 2012-04-20 at 94e9384)
71
+ + do_for_each_ref(): only iterate over the subtree that was requested
72
+ + refs: store references hierarchically
73
+ + sort_ref_dir(): simplify logic
74
+ + refs.c: rename ref_array -> ref_dir
75
+ + struct ref_entry: nest the value part in a union
76
+ + check_refname_component(): return 0 for zero-length components
77
+ + free_ref_entry(): new function
78
+ + names_conflict(): simplify implementation
79
+ + repack_without_ref(): reimplement using do_for_each_ref_in_array()
80
+ + do_for_each_ref_in_arrays(): new function
81
+ + do_for_each_ref_in_array(): new function
82
+ + refs: manage current_ref within do_one_ref()
83
+ + refs.c: reorder definitions more logically
84
+
85
+* mk/gitweb-diff-hl (2012-04-11) 8 commits
86
+ (merged to 'next' on 2012-04-20 at 54179a2)
87
+ + gitweb: Refinement highlightning in combined diffs
88
+ + gitweb: Highlight interesting parts of diff
89
+ + gitweb: Push formatting diff lines to print_diff_chunk()
90
+ + gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
91
+ + gitweb: Extract print_sidebyside_diff_lines()
92
+ + gitweb: Pass esc_html_hl_regions() options to esc_html()
93
+ + gitweb: esc_html_hl_regions(): Don't create empty <span> elements
94
+ + gitweb: Use descriptive names in esc_html_hl_regions()
95
+
96
+"gitweb" learns to highlight the patch it outputs even more.
97
+
98
+* pw/fast-import-dataref-parsing (2012-04-10) 1 commit
99
+ (merged to 'next' on 2012-04-20 at c299a63)
100
+ + fast-import: tighten parsing of datarefs
101
+
102
+The parser in "fast-import" did not diagnose ":9" style references
103
+that is not followed by required SP/LF as an error.
104
+
105
+* rl/maint-stash-i18n-save-error (2012-04-14) 1 commit
106
+ (merged to 'next' on 2012-04-23 at 3692fec)
107
+ + stash: use eval_gettextln correctly
108
+
109
+* zj/upstream-error-message (2012-04-15) 5 commits
110
+ (merged to 'next' on 2012-04-20 at 1ed9682)
111
+ + i18n: mark @{upstream} error messages for translation
112
+ + Be more specific if upstream branch is not tracked
113
+ + Provide better message for barnhc_wiht_tpyo@{u}
114
+ + Provide branch name in error message when using @{u}
115
+ + t1507: add tests to document @{upstream} behaviour
116
+
117
+Error messages given when @{u} is used for a branch without its
118
+upstream configured have been clatified.
119
+
120
+--------------------------------------------------
121
+[New Topics]
122
+
123
+* mm/simple-push (2012-04-24) 7 commits
124
+ - push.default doc: explain simple after upstream
125
+ - push: document the future default change for push.default (matching -> simple)
126
+ - t5570: use explicit push refspec
127
+ - push: introduce new push.default mode "simple"
128
+ - t5528-push-default.sh: add helper functions
129
+ - Undocument deprecated alias 'push.default=tracking'
130
+ - Documentation: explain push.default option a bit more
131
+ (this branch is used by mm/push-default-switch-warning.)
132
+
133
+New users tend to work on one branch at a time and push the result
134
+out. The current and upstream modes of push is a more suitable default
135
+mode than matching mode for these people, but neither is surprise-free
136
+depending on how the project is set up. Introduce a "simple" mode that
137
+is a subset of "upstream" but only works when the branch is named the same
138
+between the remote and local repositories.
139
+
140
+The plan is to make it the new default when push.default is not
141
+configured.
142
+
143
+* mh/ref-api-lazy-loose (2012-04-25) 30 commits
144
+ - refs: read loose references lazily
145
+ - create_dir_entry(): allow the flag value to be passed as an argument
146
+ - read_loose_refs(): access ref_cache via the ref_dir field
147
+ - read_loose_refs(): rename function from get_ref_dir()
148
+ - struct ref_dir: store a reference to the enclosing ref_cache
149
+ - sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)
150
+ - do_for_each_ref_in_dir(): take (ref_entry *) instead of (ref_dir *)
151
+ - do_for_each_ref_in_dirs(): take (ref_entry *) instead of (ref_dir *)
152
+ - add_entry(): take (ref_entry *) instead of (ref_dir *)
153
+ - search_ref_dir(): take (ref_entry *) instead of (ref_dir *)
154
+ - search_for_subdir(): take (ref_entry *) instead of (ref_dir *)
155
+ - get_ref_dir(): remove dirname argument
156
+ - get_ref_dir(): take (ref_entry *) instead of (ref_dir *)
157
+ - find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)
158
+ - add_ref(): take (ref_entry *) instead of (ref_dir *)
159
+ - read_packed_refs(): take (ref_entry *) instead of (ref_dir *)
160
+ - find_ref(): take (ref_entry *) instead of (ref_dir *)
161
+ - is_refname_available(): take (ref_entry *) instead of (ref_dir *)
162
+ - get_loose_refs(): return (ref_entry *) instead of (ref_dir *)
163
+ - get_packed_refs(): return (ref_entry *) instead of (ref_dir *)
164
+ - refs: wrap top-level ref_dirs in ref_entries
165
+ - do_for_each_reflog(): reuse strbuf across recursive function calls
166
+ - do_for_each_reflog(): use a strbuf to hold logfile name
167
+ - do_for_each_reflog(): return early on error
168
+ - get_ref_dir(): take the containing directory as argument
169
+ - refs.c: extract function search_for_subdir()
170
+ - get_ref_dir(): require that the dirname argument ends in '/'
171
+ - get_ref_dir(): rename "base" parameter to "dirname"
172
+ - get_ref_dir(): use a strbuf to hold refname
173
+ - get_ref_dir(): return early if directory cannot be read
174
+
175
+Refs API is updated to lazily read sub-hierarchies of refs/ namespace,
176
+so that we do not have to grab everything from the filesystem when we
177
+are only interested in listing branches, for example.
178
+
179
+* mm/include-userpath (2012-04-25) 2 commits
180
+ (merged to 'next' on 2012-04-26 at c68e261)
181
+ + fixup! config: expand tildes in include.path variable
182
+ + config: expand tildes in include.path variable
183
+
184
+The new "include.path" directive in the configuration files learned
185
+to understand "~/path" and "~user/path".
186
+
187
+* rs/commit-list-append (2012-04-25) 3 commits
188
+ (merged to 'next' on 2012-04-26 at 2ba48b3)
189
+ + commit: remove commit_list_reverse()
190
+ + revision: append to list instead of insert and reverse
191
+ + sequencer: export commit_list_append()
192
+
193
+* jk/maint-config-bogus-section (2012-04-25) 1 commit
194
+ (merged to 'next' on 2012-04-26 at 9919198)
195
+ + config: reject bogus section names for --rename-section
196
+
197
+"git config --rename-section" to rename an existing section into a
198
+bogus one did not check the new name.
199
+
200
+* kk/maint-gitweb-missing-owner (2012-04-25) 1 commit
201
+ - gitweb: Don't set owner if got empty value from projects.list
202
+ (this branch is used by kk/gitweb-omit-expensive.)
203
134
-* pw/t5800-import-race-fix (2012-04-22) 2 commits
135
- - fixup! git-remote-testgit: fix race when spawning fast-import
136
- - git-remote-testgit: fix race when spawning fast-import
204
+Will merge to 'next'.
205
138
-Will merge to 'next' after squashing the fixup!
206
+* jk/doc-asciidoc-inline-literal (2012-04-26) 1 commit
207
+ - docs: stop using asciidoc no-inline-literal
208
140
-* nd/i18n (2012-04-23) 11 commits
141
- - i18n: bundle: mark strings for translation
142
- - i18n: index-pack: mark strings for translation
143
- - i18n: apply: update say_patch_name to give translators complete sentence
144
- - i18n: apply: mark strings for translation
145
- - i18n: remote: mark strings for translation
146
- - i18n: make warn_dangling_symref() automatically append \n
147
- - i18n: help: mark strings for translation
148
- - i18n: mark relative dates for translation
149
- - fixup! strbuf: convenience format functions with \n automatically appended
150
- - strbuf: convenience format functions with \n automatically appended
151
- - Makefile: feed all header files to xgettext
209
+Our documentation was written for an ancient version of AsciiDoc,
210
+making the source not very readable.
211
153
-Will merge to 'next' after squashing the fixup!
154
-We can address the pseudo-underline of section headers in "git help --all"
155
-as a follow-up patch.
212
+* kk/gitweb-omit-expensive (2012-04-26) 2 commits
213
+ - gitweb: Option to not display information about owner
214
+ - gitweb: Option to omit column with time of the last change
215
+ (this branch uses kk/maint-gitweb-missing-owner.)
216
157
-* rk/git-svn-ignore-sigpipe (2012-04-23) 3 commits
158
- - git-svn: drop redundant blocking of SIGPIPE
159
- - git-svn: ignore SIGPIPE
160
- - git-svn: use POSIX::sigprocmask to block signals
217
+"gitweb" learned to optionally omit output of fields that are expensive
218
+to generate.
219
162
-Waiting for an Ack from Eric.
220
+Will merge to 'next'.
221
222
--------------------------------------------------
223
[Stalled]
@@ -199,16 +257,38 @@ not working :-(.
257
--------------------------------------------------
258
[Cooking]
259
202
-* nh/empty-rebase (2012-04-20) 7 commits
203
- - fixup! git-rebase: add keep_empty flag
204
- - git-rebase: add keep_empty flag
205
- - fixup! git-cherry-pick: Add test to validate new options
206
- - git-cherry-pick: Add test to validate new options
207
- - fixup! git-cherry-pick: Add keep-redundant-commits option
208
- - git-cherry-pick: Add keep-redundant-commits option
209
- - git-cherry-pick: add allow-empty option
210
-
211
-Will merge to 'next' after squashing the fixup!
260
+* pw/t5800-import-race-fix (2012-04-24) 1 commit
261
+ (merged to 'next' on 2012-04-24 at e97bb42)
262
+ + git-remote-testgit: fix race when spawning fast-import
263
+
264
+Longstanding bug in a test scaffolding that occasionally made t5800
265
+hang was fixed.
266
+
267
+* nd/i18n (2012-04-25) 11 commits
268
+ - help: replace underlining "help -a" headers using hyphens with a blank line
269
+ (merged to 'next' on 2012-04-24 at 07965a4)
270
+ + i18n: bundle: mark strings for translation
271
+ + i18n: index-pack: mark strings for translation
272
+ + i18n: apply: update say_patch_name to give translators complete sentence
273
+ + i18n: apply: mark strings for translation
274
+ + i18n: remote: mark strings for translation
275
+ + i18n: make warn_dangling_symref() automatically append \n
276
+ + i18n: help: mark strings for translation
277
+ + i18n: mark relative dates for translation
278
+ + strbuf: convenience format functions with \n automatically appended
279
+ + Makefile: feed all header files to xgettext
280
+
281
+More message strings marked for i18n.
282
+
283
+* nh/empty-rebase (2012-04-24) 4 commits
284
+ (merged to 'next' on 2012-04-24 at 91d2dfd)
285
+ + git-rebase: add keep_empty flag
286
+ + git-cherry-pick: Add test to validate new options
287
+ + git-cherry-pick: Add keep-redundant-commits option
288
+ + git-cherry-pick: add allow-empty option
289
+
290
+"git rebase" learned to optionally keep commits that do not introduce
291
+any change in the original history.
292
293
* rt/cherry-revert-conflict-summary (2012-04-19) 1 commit
294
(merged to 'next' on 2012-04-23 at e7766c2)
@@ -228,12 +308,6 @@ Will merge to 'master'.
308
309
Will merge to 'master'.
310
231
-* jm/maint-strncpy-diff-no-index (2012-04-16) 1 commit
232
- (merged to 'next' on 2012-04-20 at 638ed9f)
233
- + diff: avoid stack-buffer-read-overrun for very long name
234
-
235
-Will merge to 'master'.
236
-
311
* lp/diffstat-with-graph (2012-04-18) 6 commits
312
(merged to 'next' on 2012-04-23 at 8de0747)
313
+ Prevent graph_width of stat width from falling below min
@@ -271,13 +345,12 @@ the "--" to the end of the argv_array it passes to setup_revisions().
345
Will merge to 'master'.
346
347
* cb/daemon-test-race-fix (2012-04-19) 1 commit
274
- - git-daemon wrapper to wait until daemon is ready
348
+ (merged to 'next' on 2012-04-24 at d5c30be)
349
+ + git-daemon wrapper to wait until daemon is ready
350
351
Fix race condition between starting and waiting for git-daemon in the
352
test.
353
279
-Will merge to 'next'.
280
-
354
* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit
355
(merged to 'next' on 2012-04-23 at 9e0c8b4)
356
+ properly keep track of current working directory
@@ -287,12 +360,6 @@ discovery stopped at a mount point.
360
361
Will merge to 'master'.
362
290
-* rl/maint-stash-i18n-save-error (2012-04-14) 1 commit
291
- (merged to 'next' on 2012-04-23 at 3692fec)
292
- + stash: use eval_gettextln correctly
293
-
294
-Will merge to 'master'.
295
-
363
* nd/columns (2012-04-20) 9 commits
364
- tag: add --column
365
- column: support piping stdout to external git-column process
@@ -304,9 +371,10 @@ Will merge to 'master'.
371
- Stop starting pager recursively
372
- Add column layout skeleton and git-column
373
307
-Will merge to 'next'.
374
+A couple of commands learn --column option to produce columnar output.
375
309
-* nl/http-proxy-more (2012-04-19) 7 commits
376
+* nl/http-proxy-more (2012-04-26) 8 commits
377
+ - http: try an uppercase version of $proto_proxy
378
- http: fix proxy password passing
379
- http: fix proxy authentication
380
- http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
@@ -319,33 +387,6 @@ The code to talk to http proxies learn to use the same credential
387
API used to talk to the final http destinations. This still needs
388
to peek into $ENV{HTTPS_PROXY}.
389
322
-* mb/fetch-call-a-non-branch-a-ref (2012-04-17) 2 commits
323
- (merged to 'next' on 2012-04-20 at df2c57e)
324
- + fetch: describe new refs based on where it came from
325
- + fetch: Give remote_ref to update_local_ref() as well
326
-
327
-Will merge to 'master'.
328
-
329
-* mh/ref-api (2012-04-10) 13 commits
330
- (merged to 'next' on 2012-04-20 at 94e9384)
331
- + do_for_each_ref(): only iterate over the subtree that was requested
332
- + refs: store references hierarchically
333
- + sort_ref_dir(): simplify logic
334
- + refs.c: rename ref_array -> ref_dir
335
- + struct ref_entry: nest the value part in a union
336
- + check_refname_component(): return 0 for zero-length components
337
- + free_ref_entry(): new function
338
- + names_conflict(): simplify implementation
339
- + repack_without_ref(): reimplement using do_for_each_ref_in_array()
340
- + do_for_each_ref_in_arrays(): new function
341
- + do_for_each_ref_in_array(): new function
342
- + refs: manage current_ref within do_one_ref()
343
- + refs.c: reorder definitions more logically
344
-
345
-Allows walking only a sub-hierarchy in refs/*.
346
-
347
-Will merge to 'master'.
348
-
390
* jk/repack-no-explode-objects-from-old-pack (2012-04-18) 4 commits
391
(merged to 'next' on 2012-04-20 at 4eb2534)
392
+ gc: use argv-array for sub-commands
@@ -354,36 +395,18 @@ Will merge to 'master'.
395
(merged to 'next' on 2012-04-15 at 7586e50)
396
+ gc: do not explode objects which will be immediately pruned
397
357
-* ld/git-p4-tags-and-labels (2012-04-11) 2 commits
398
+* ld/git-p4-tags-and-labels (2012-04-25) 7 commits
399
+ (merged to 'next' on 2012-04-25 at 8b959e5)
400
+ + git p4: fix unit tests
401
+ (merged to 'next' on 2012-04-24 at bf55d92)
402
+ + git p4: move verbose to base class
403
+ + git p4: Ignore P4EDITOR if it is empty
404
+ + git p4: Squash P4EDITOR in test harness
405
+ + git p4: fix-up "import/export of labels to/from p4"
406
(merged to 'next' on 2012-04-15 at 1b1e9a1)
407
+ git p4: import/export of labels to/from p4
408
+ git p4: Fixing script editor checks
409
362
-Waiting for a follow-up to address the review comments
363
-by Pete Wyckoff Message-ID: <20120418113422.GB19994@padd.com>
364
-
365
-* zj/upstream-error-message (2012-04-15) 5 commits
366
- (merged to 'next' on 2012-04-20 at 1ed9682)
367
- + i18n: mark @{upstream} error messages for translation
368
- + Be more specific if upstream branch is not tracked
369
- + Provide better message for barnhc_wiht_tpyo@{u}
370
- + Provide branch name in error message when using @{u}
371
- + t1507: add tests to document @{upstream} behaviour
372
-
373
-Will merge to 'master'.
374
-
375
-* fc/completion-tests (2012-04-21) 7 commits
376
- (merged to 'next' on 2012-04-23 at 9b42326)
377
- + completion: fix completion after 'git --option <TAB>'
378
- + completion: avoid trailing space for --exec-path
379
- + completion: add missing general options
380
- + completion: simplify by using $prev
381
- + completion: simplify __gitcomp_1
382
- + tests: add tests for the __gitcomp() completion helper function
383
- + tests: add initial bash completion tests
384
-
385
-Will merge to 'master'.
386
-
410
* nd/threaded-index-pack (2012-04-19) 4 commits
411
- index-pack: disable threading if NO_PREAD is defined
412
- index-pack: support multithreaded delta resolving
@@ -402,16 +425,9 @@ flight using curl-multi.
425
426
Will merge to 'master'.
427
405
-* pw/fast-import-dataref-parsing (2012-04-10) 1 commit
406
- (merged to 'next' on 2012-04-20 at c299a63)
407
- + fast-import: tighten parsing of datarefs
408
-
409
-Will merge to 'master'.
410
-
428
* tr/xdiff-fast-hash (2012-04-09) 1 commit
412
- - xdiff: load full words in the inner loop of xdl_hash_record
413
-
414
-Will merge to 'next'.
429
+ (merged to 'next' on 2012-04-24 at ed693cf)
430
+ + xdiff: load full words in the inner loop of xdl_hash_record
431
432
* jc/index-v4 (2012-04-04) 10 commits
433
(merged to 'next' on 2012-04-19 at 5e4b029)
@@ -436,36 +452,6 @@ student-hopefuls.
452
The bottom one makes use of "varint" encoding from the stalled
453
jc/split-blob topic.
454
439
-* mk/gitweb-diff-hl (2012-04-11) 8 commits
440
- (merged to 'next' on 2012-04-20 at 54179a2)
441
- + gitweb: Refinement highlightning in combined diffs
442
- + gitweb: Highlight interesting parts of diff
443
- + gitweb: Push formatting diff lines to print_diff_chunk()
444
- + gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
445
- + gitweb: Extract print_sidebyside_diff_lines()
446
- + gitweb: Pass esc_html_hl_regions() options to esc_html()
447
- + gitweb: esc_html_hl_regions(): Don't create empty <span> elements
448
- + gitweb: Use descriptive names in esc_html_hl_regions()
449
-
450
-Will merge to 'master'.
451
-
452
-* it/fetch-pack-many-refs (2012-04-10) 4 commits
453
- (merged to 'next' on 2012-04-20 at e2126d7)
454
- + remote-curl: main test case for the OS command line overflow
455
- + fetch-pack: test cases for the new --stdin option
456
- + remote-curl: send the refs to fetch-pack on stdin
457
- + fetch-pack: new --stdin option to read refs from stdin
458
-
459
-Will merge to 'master'.
460
-
461
-* hv/submodule-recurse-push (2012-03-30) 3 commits
462
- (merged to 'next' on 2012-04-20 at fe99e3d)
463
- + push: teach --recurse-submodules the on-demand option
464
- + Refactor submodule push check to use string list instead of integer
465
- + Teach revision walking machinery to walk multiple times sequencially
466
-
467
-Will merge to 'master'.
468
-
455
* th/difftool-diffall (2012-04-23) 8 commits
456
- difftool: print list of valid tools with '--tool-help'
457
- difftool: teach difftool to handle directory diffs
@@ -489,23 +475,7 @@ Not urgent.
475
Updates run_hook() API to be much less specific to "commit". It would
476
only be useful if people start doing more interesting things with hooks.
477
492
-* mm/push-default-switch-warning (2012-04-23) 10 commits
493
- - fixup! push: introduce new push.default mode "simple"
494
- - fixup! t5528-push-default.sh: add helper functions
495
- - push: suggested updates to push configuration documentation
478
+* mm/push-default-switch-warning (2012-04-26) 2 commits
479
+ - t5541: warning message is given even with --quiet
480
- push: start warning upcoming default change for push.default
497
- - push: document the future default change for push.default (matching -> simple)
498
- - t5570: use explicit push refspec
499
- - push: introduce new push.default mode "simple"
500
- - t5528-push-default.sh: add helper functions
501
- - Undocument deprecated alias 'push.default=tracking'
502
- - Documentation: explain push.default option a bit more
503
-
504
-Introduces 'simple' mode to be used as the push.default in a future
505
-version of git. I think the series is almost there modulo some minor
506
-nits.
507
-
508
-This topic should be renamed to "mm/push-simple-method" and the last
509
-step to start warning made into a separate topic that build on it, but
510
-the review comments need to be addressed in a reroll before that
511
-
481
+ (this branch uses mm/simple-push.)