What's cooking (2013/09 #05)
Junio C Hamano committed
Sep 18, 2013 at 14:51 UTC
e0d383cca73911d7f71d00c2162a1b41b34f4e0f
1 file changed
+399
-389
whats-cooking.txt
+399
-389
@@ -1,17 +1,17 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2013, #04; Fri, 13)
4
-X-master-at: b3e7d24ca19d841eb2c5c7fce7919ebb5d370a6f
5
-X-next-at: 7b94f8e7d8c83ea87e9d80f00dc6cfd2dc245329
3
+Subject: What's cooking in git.git (Sep 2013, #05; Wed, 18)
4
+X-master-at: eeaee045c85719821e685a22603a645a0ea85bad
5
+X-next-at: d97bfe6d8d1499241374e46954d566a3af3b8087
6
7
-What's cooking in git.git (Sep 2013, #04; Fri, 13)
7
+What's cooking in git.git (Sep 2013, #05; Wed, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-The third batch of topics are now in 'master'.
14
+The fourth batch of topics are in 'master'.
15
16
You can find the changes described here in the integration branches
17
of the repositories listed at
@@ -21,57 +21,98 @@ of the repositories listed at
21
--------------------------------------------------
22
[Graduated to "master"]
23
24
-* jc/commit-is-spelled-with-two-ems (2013-09-05) 2 commits
25
- (merged to 'next' on 2013-09-05 at 982aef2)
26
- + typofix: cherry is spelled with two ars
27
- + typofix: commit is spelled with two ems
24
+* ab/gitweb-author-initials (2013-08-30) 1 commit
25
+ (merged to 'next' on 2013-09-09 at ecb924d)
26
+ + gitweb: Fix the author initials in blame for non-ASCII names
27
+
28
+
29
+* ap/commit-author-mailmap (2013-08-24) 1 commit
30
+ (merged to 'next' on 2013-09-09 at 79d5a20)
31
+ + commit: search author pattern against mailmap
32
+
33
+ "git commit --author=$name", when $name is not in the canonical
34
+ "A. U. Thor <au.thor@example.xz>" format, looks for a matching name
35
+ from existing history, but did not consult mailmap to grab the
36
+ preferred author name.
37
+
38
+
39
+* bc/send-email-ssl-die-message-fix (2013-09-10) 1 commit
40
+ (merged to 'next' on 2013-09-13 at c6fcdf4)
41
+ + send-email: don't call methods on undefined values
42
+
43
+ When send-email comes up with an error message to die with upon
44
+ failure to start an SSL session, it tried to read the error string
45
+ from a wrong place.
46
+
47
48
+* dw/diff-no-index-doc (2013-08-28) 2 commits
49
+ (merged to 'next' on 2013-09-10 at 423c8f6)
50
+ + diff --no-index: describe in a separate paragraph
51
+ + diff --no-index: clarify operation when not inside a repository
52
+
53
+ When the user types "git diff" outside a working tree, thinking he
54
+ is inside one, the current error message that is a single-liner
55
+ "usage: git diff --no-index <path> <path>" may not be sufficient to
56
+ make him realize the mistake. Add "Not a git repository" to the
57
+ error message when we fell into the "--no-index" mode without an
58
+ explicit command line option to instruct us to do so.
59
+
60
+
61
+* fc/contrib-bzr-hg-fixes (2013-09-03) 10 commits
62
+ (merged to 'next' on 2013-09-12 at f5e8684)
63
+ + contrib/remote-helpers: quote variable references in redirection targets
64
+ + contrib/remote-helpers: style updates for test scripts
65
+ + remote-hg: use notes to keep track of Hg revisions
66
+ + remote-helpers: cleanup more global variables
67
+ + remote-helpers: trivial style fixes
68
+ + remote-hg: improve basic test
69
+ + remote-hg: add missing &&s in the test
70
+ + remote-hg: fix test
71
+ + remote-bzr: make bzr branches configurable per-repo
72
+ + remote-bzr: fix export of utf-8 authors
73
30
-* jc/pager-configuration-doc (2013-08-29) 1 commit
31
- (merged to 'next' on 2013-09-05 at 3169083)
32
- + config: rewrite core.pager documentation
74
34
- It was unclear in the documentation how various configurations and
35
- environment variables determine which pager is eventually used.
75
+* fc/fast-export (2013-09-03) 2 commits
76
+ (merged to 'next' on 2013-09-09 at 8d5d396)
77
+ + fast-export: refactor get_tags_and_duplicates()
78
+ + fast-export: make extra_refs global
79
80
+ Code simpification.
81
38
-* jk/config-int-range-check (2013-09-09) 5 commits
39
- (merged to 'next' on 2013-09-09 at 9ab779d)
40
- + git-config: always treat --int as 64-bit internally
41
- + config: make numeric parsing errors more clear
42
- + config: set errno in numeric git_parse_* functions
43
- + config: properly range-check integer values
44
- + config: factor out integer parsing from range checks
82
46
- "git config" did not provide a way to set or access numbers larger
47
- than a native "int" on the platform; it now provides 64-bit signed
48
- integers on all platforms.
83
+* fc/rev-parse-test-updates (2013-09-03) 4 commits
84
+ (merged to 'next' on 2013-09-09 at 92c51ef)
85
+ + rev-parse test: use standard test functions for setup
86
+ + rev-parse test: use test_cmp instead of "test" builtin
87
+ + rev-parse test: use test_must_fail, not "if <command>; then false; fi"
88
+ + rev-parse test: modernize quoting and whitespace
89
90
+ Modernize tests.
91
51
-* mm/fast-import-feature-doc (2013-08-25) 1 commit
52
- (merged to 'next' on 2013-09-05 at 83802e2)
53
- + Documentation/fast-import: clarify summary for `feature` command
92
93
+* fc/t3200-fixes (2013-09-03) 3 commits
94
+ (merged to 'next' on 2013-09-09 at 3626363)
95
+ + t: branch: fix broken && chains
96
+ + t: branch: fix typo
97
+ + t: branch: trivial style fix
98
56
-* mm/mediawiki-dumb-push-fix (2013-09-03) 4 commits
57
- (merged to 'next' on 2013-09-05 at f8313f4)
58
- + git-remote-mediawiki: no need to update private ref in non-dumb push
59
- + git-remote-mediawiki: use no-private-update capability on dumb push
60
- + transport-helper: add no-private-update capability
61
- + git-remote-mediawiki: add test and check Makefile targets
99
100
+* fc/trivial (2013-09-08) 5 commits
101
+ (merged to 'next' on 2013-09-09 at a8ad2e1)
102
+ + pull: use $curr_branch_short more
103
+ + add: trivial style cleanup
104
+ + reset: trivial style cleanup
105
+ + branch: trivial style fix
106
+ + reset: trivial refactoring
107
64
-* mm/remote-helpers-doc (2013-08-26) 1 commit
65
- (merged to 'next' on 2013-09-05 at c181b35)
66
- + Documentation/remote-helpers: document common use-case for private ref
108
109
+* jc/cvsserver-perm-bit-fix (2013-09-11) 1 commit
110
+ (merged to 'next' on 2013-09-13 at 56db105)
111
+ + cvsserver: pick up the right mode bits
112
69
-* mn/doc-pack-heu-remove-dead-pastebin (2013-08-23) 1 commit
70
- (merged to 'next' on 2013-09-05 at 5caecec)
71
- + remove dead pastebin link from pack-heuristics document
113
+ "git cvsserver" computed the permission mode bits incorrectly for
114
+ executable files.
115
73
---------------------------------------------------
74
-[New Topics]
116
117
* jc/url-match (2013-09-12) 1 commit
118
(merged to 'next' on 2013-09-13 at 7b94f8e)
@@ -81,23 +122,260 @@ of the repositories listed at
122
could be relocated when it grows, which was a brown-paper-bag bug
123
that can lead to a crash introduced on 'master' post 1.8.4 release.
124
84
- Will merge to 'master' in the fourth batch.
125
+
126
+* jk/duplicate-objects-in-packs (2013-09-04) 5 commits
127
+ (merged to 'next' on 2013-09-09 at 72f2c3d)
128
+ + t5308: check that index-pack --strict detects duplicate objects
129
+ + test index-pack on packs with recoverable delta cycles
130
+ + add tests for indexing packs with delta cycles
131
+ + sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP
132
+ + test-sha1: add a binary output mode
133
+
134
+ A packfile that stores the same object more than once is broken and
135
+ will be rejected.
136
137
87
-* jx/relative-path-regression-fix (2013-09-13) 3 commits
88
- - Use simpler relative_path when set_git_dir
89
- - relative_path should honor dos_drive_prefix
90
- - test: use unambigous leading path (/foo) for mingw
91
- (this branch uses jx/clean-interactive.)
138
+* jk/free-tree-buffer (2013-06-06) 1 commit
139
+ (merged to 'next' on 2013-09-09 at 3576189)
140
+ + clear parsed flag when we free tree buffers
141
142
94
-* nd/unpack-entry-optim-in-pack-objects (2013-09-13) 1 commit
95
- - pack-objects: no crc check when the cached version is used
143
+* jk/has-sha1-file-retry-packed (2013-08-30) 1 commit
144
+ (merged to 'next' on 2013-09-09 at fc42e9b)
145
+ + has_sha1_file: re-check pack directory before giving up
146
97
- The codepath to use data from packfiles that is only exercised in
98
- pack-objects unnecessarily checked crc checksum of the pack data,
99
- even when it ends up using in-core copy that it got by reading from
100
- the pack (at which point the checksum was validated).
147
+ When an object is not found after checking the packfiles and then
148
+ loose object directory, read_sha1_file() re-checks the packfiles to
149
+ prevent racing with a concurrent repacker; teach the same logic to
150
+ has_sha1_file().
151
+
152
+
153
+* jk/pager-bypass-cat-for-default-pager (2013-09-03) 1 commit
154
+ (merged to 'next' on 2013-09-09 at c9cfbaa)
155
+ + pager: turn on "cat" optimization for DEFAULT_PAGER
156
+
157
+ If a build-time fallback is set to "cat" instead of "less", we
158
+ should apply the same "no subprocess or pipe" optimization as we
159
+ apply to user-supplied GIT_PAGER=cat.
160
+
161
+
162
+* jk/remove-remote-helpers-in-python (2013-09-09) 1 commit
163
+ (merged to 'next' on 2013-09-10 at 49c7a74)
164
+ + git_remote_helpers: remove little used Python library
165
+
166
+ Remove now disused remote-helpers framework for helpers written in
167
+ Python.
168
+
169
+
170
+* jk/write-broken-index-with-nul-sha1 (2013-08-28) 1 commit
171
+ (merged to 'next' on 2013-09-09 at 6953f27)
172
+ + write_index: optionally allow broken null sha1s
173
+
174
+ Earlier we started rejecting an attempt to add 0{40} object name to
175
+ the index and to tree objects, but it sometimes is necessary to
176
+ allow so to be able to use tools like filter-branch to correct such
177
+ broken tree objects.
178
+
179
+
180
+* js/add-i-mingw (2013-09-04) 1 commit
181
+ (merged to 'next' on 2013-09-10 at 50ab841)
182
+ + add--interactive: fix external command invocation on Windows
183
+
184
+ The implementation of "add -i" has a crippling code to work around
185
+ ActiveState Perl limitation but it by mistake also triggered on Git
186
+ for Windows where MSYS perl is used.
187
+
188
+
189
+* jx/clean-interactive (2013-08-28) 1 commit
190
+ (merged to 'next' on 2013-09-09 at 477fec6)
191
+ + documentation: clarify notes for clean.requireForce
192
+ (this branch is used by jx/relative-path-regression-fix.)
193
+
194
+ Finishing touches to update the document to adjust to a new option
195
+ "git clean" learned recently.
196
+
197
+
198
+* kk/tests-with-no-perl (2013-08-24) 4 commits
199
+ (merged to 'next' on 2013-09-09 at 67510b1)
200
+ + reset test: modernize style
201
+ + t/t7106-reset-unborn-branch.sh: Add PERL prerequisite
202
+ + add -i test: use skip_all instead of repeated PERL prerequisite
203
+ + Make test "using invalid commit with -C" more strict
204
+
205
+ Some tests were not skipped under NO_PERL build.
206
+
207
+
208
+* ks/p4-view-spec (2013-09-03) 2 commits
209
+ (merged to 'next' on 2013-09-10 at 8ceb2ec)
210
+ + git p4: implement view spec wildcards with "p4 where"
211
+ + git p4 test: sanitize P4CHARSET
212
+
213
+ Replaced with a reroll that was whitespace damaged.
214
+
215
+
216
+* nd/git-dir-pointing-at-gitfile (2013-09-03) 1 commit
217
+ (merged to 'next' on 2013-09-09 at 5b0a4bf)
218
+ + Make setup_git_env() resolve .git file when $GIT_DIR is not specified
219
+
220
+ We made sure that we notice the user-supplied GIT_DIR is actually a
221
+ gitfile, but failed to do so when the default ".git" is a gitfile.
222
+
223
+
224
+* rh/ishes-doc (2013-09-04) 7 commits
225
+ (merged to 'next' on 2013-09-10 at 3611e8a)
226
+ + glossary: fix and clarify the definition of 'ref'
227
+ + revisions.txt: fix and clarify <rev>^{<type>}
228
+ + glossary: more precise definition of tree-ish (a.k.a. treeish)
229
+ + use 'commit-ish' instead of 'committish'
230
+ + use 'tree-ish' instead of 'treeish'
231
+ + glossary: define commit-ish (a.k.a. committish)
232
+ + glossary: mention 'treeish' as an alternative to 'tree-ish'
233
+
234
+ We liberally use "committish" and "commit-ish" (and "treeish" and
235
+ "tree-ish"); as these are non-words, let's unify these terms to
236
+ their dashed form. More importantly, clarify the documentation on
237
+ object peeling using these terms.
238
+
239
+
240
+* ss/doclinks (2013-09-06) 1 commit
241
+ (merged to 'next' on 2013-09-10 at 2d029a9)
242
+ + Documentation: make AsciiDoc links always point to HTML files
243
+
244
+ When we converted many documents that were traditionally text-only
245
+ to be formatted to AsciiDoc, we did not update links that point at
246
+ them to refer to the formatted HTML files.
247
+
248
+
249
+* ta/user-manual (2013-08-27) 11 commits
250
+ (merged to 'next' on 2013-09-10 at 1361be1)
251
+ + "git prune" is safe
252
+ + Remove irrelevant reference from "Tying it all together"
253
+ + Remove unnecessary historical note from "Object storage format"
254
+ + Improve section "Merging multiple trees"
255
+ + Improve section "Manipulating branches"
256
+ + Simplify "How to make a commit"
257
+ + Fix some typos and improve wording
258
+ + Use "git merge" instead of "git pull ."
259
+ + Use current output for "git repack"
260
+ + Use current "detached HEAD" message
261
+ + Call it "Git User Manual" and remove reference to very old Git version
262
+
263
+ Update the user's manual to more recent versions of Git.
264
+
265
+
266
+* tb/precompose-autodetect-fix (2013-08-27) 1 commit
267
+ (merged to 'next' on 2013-09-09 at 9bfdac1)
268
+ + Set core.precomposeunicode to true on e.g. HFS+
269
+
270
+ On MacOS X, we detected if the filesystem needs the "pre-composed
271
+ unicode strings" workaround, but did not automatically enable it.
272
+ Now we do.
273
+
274
+
275
+* uh/git-svn-serf-fix (2013-09-06) 1 commit
276
+ (merged to 'next' on 2013-09-13 at d65a9a1)
277
+ + git-svn: fix termination issues for remote svn connections
278
+
279
+ "git-svn" used with SVN 1.8.0 when talking over https:// connection
280
+ dumped core due to a bug in the serf library that SVN uses. Work
281
+ it around on our side, even though the SVN side is being fixed.
282
+
283
+--------------------------------------------------
284
+[New Topics]
285
+
286
+* es/name-hash-no-trailing-slash-in-dirs (2013-09-17) 4 commits
287
+ - dir: revert work-around for retired dangerous behavior
288
+ - name-hash: stop storing trailing '/' on paths in index_state.dir_hash
289
+ - employ new explicit "exists in index?" API
290
+ - name-hash: refactor polymorphic index_name_exists()
291
+
292
+ Clean up the internal of the name-hash mechanism used to work
293
+ around case insensitivity on some filesystems to cleanly fix a
294
+ long-standing API glitch where the caller of cache_name_exists()
295
+ that ask about a directory with a counted string was required to
296
+ have '/' at one location past the end of the string.
297
+
298
+ Will merge to 'next'.
299
+
300
+
301
+* po/dot-url (2013-09-13) 2 commits
302
+ - config doc: update dot-repository notes
303
+ - doc: command line interface (cli) dot-repository dwimmery
304
+
305
+ Explain how '.' can be used to refer to the "current repository"
306
+ in the documentation.
307
+
308
+ Will merge to 'next'.
309
+
310
+
311
+* es/contacts-in-subdir (2013-09-17) 1 commit
312
+ - contacts: fix to work in subdirectories
313
+
314
+ Allow the contacts (in contrib/) script to run from inside a
315
+ subdirectory.
316
+
317
+ Will merge to 'next'.
318
+
319
+
320
+* jc/upload-pack-send-symref (2013-09-17) 7 commits
321
+ - clone: test the new HEAD detection logic
322
+ - connect: annotate refs with their symref information in get_remote_head()
323
+ - connect.c: make parse_feature_value() static
324
+ - upload-pack: send non-HEAD symbolic refs
325
+ - upload-pack: send symbolic ref information as capability
326
+ - upload-pack.c: do not pass confusing cb_data to mark_our_ref()
327
+ - t5505: fix "set-head --auto with ambiguous HEAD" test
328
+
329
+ One long-standing flaw in the pack transfer protocol used by "git
330
+ clone" was that there was no way to tell the other end which branch
331
+ "HEAD" points at, and the receiving end needed to guess. A new
332
+ capability has been defined in the pack protocol to convey this
333
+ information so that cloning from a repository with more than one
334
+ branches pointing at the same commit where the HEAD is at now
335
+ reliably sets the initial branch in the resulting repository.
336
+
337
+ Will merge to 'next'.
338
+
339
+
340
+* jk/clone-progress-to-stderr (2013-09-18) 3 commits
341
+ - clone: always set transport options
342
+ - clone: treat "checking connectivity" like other progress
343
+ - clone: send diagnostic messages to stderr
344
+
345
+ Some progress and diagnostic messages from "git clone" were
346
+ incorrectly sent to the standard output stream, not to the standard
347
+ error stream.
348
+
349
+ Will merge to 'next'.
350
+
351
+
352
+* nd/fetch-pack-error-reporting-fix (2013-09-18) 1 commit
353
+ - fetch-pack.c: show correct command name that fails
354
+
355
+ When "fetch-pack" detected an error from spawned "index-pack" or
356
+ "unpack-objects", it did not report the failed program name
357
+ correctly when a shallow repository is involved.
358
+
359
+ Will merge to 'next'.
360
+
361
+
362
+* sg/complete-untracked-filter (2013-09-18) 1 commit
363
+ - completion: improve untracked directory filtering for filename completion
364
+
365
+ Will merge to 'next'.
366
+
367
+
368
+* jc/strcasecmp-pure-inline (2013-09-12) 1 commit
369
+ - mailmap: work around implementations with pure inline strcasecmp
370
+
371
+ Work around MinGW <string.h> header that does not declare strcasecmp
372
+ whose address cannot be taken.
373
+
374
+ Will merge to 'next'.
375
+
376
+
377
+* jk/shortlog-tolerate-broken-commit (2013-09-18) 1 commit
378
+ - shortlog: ignore commits with missing authors
379
380
Will merge to 'next'.
381
@@ -205,62 +483,67 @@ of the repositories listed at
483
--------------------------------------------------
484
[Cooking]
485
208
-* bc/send-email-ssl-die-message-fix (2013-09-10) 1 commit
209
- (merged to 'next' on 2013-09-13 at c6fcdf4)
210
- + send-email: don't call methods on undefined values
486
+* jx/relative-path-regression-fix (2013-09-13) 3 commits
487
+ - Use simpler relative_path when set_git_dir
488
+ - relative_path should honor dos_drive_prefix
489
+ - test: use unambigous leading path (/foo) for mingw
490
212
- When send-email comes up with an error message to die with upon
213
- failure to start an SSL session, it tried to read the error string
214
- from a wrong place.
491
+ Waiting for the review to settle.
492
216
- Will merge to 'master' in the fourth batch.
493
494
+* nd/unpack-entry-optim-in-pack-objects (2013-09-13) 1 commit
495
+ (merged to 'next' on 2013-09-17 at 00f7335)
496
+ + pack-objects: no crc check when the cached version is used
497
219
-* jc/checkout-detach-doc (2013-09-11) 1 commit
220
- - checkout: update synopsys and documentation on detaching HEAD
498
+ The codepath to use data from packfiles that is only exercised in
499
+ pack-objects unnecessarily checked crc checksum of the pack data,
500
+ even when it ends up using in-core copy that it got by reading from
501
+ the pack (at which point the checksum was validated).
502
222
- "git checkout [--detach] <commit>" was listed poorly in the
223
- synopsis section of its documentation.
503
+ Will merge to 'master' in the sixth batch.
504
505
226
-* jc/cvsserver-perm-bit-fix (2013-09-11) 1 commit
227
- (merged to 'next' on 2013-09-13 at 56db105)
228
- + cvsserver: pick up the right mode bits
506
+* jc/checkout-detach-doc (2013-09-11) 1 commit
507
+ (merged to 'next' on 2013-09-17 at 438cf13)
508
+ + checkout: update synopsys and documentation on detaching HEAD
509
230
- "git cvsserver" computed the permission mode bits incorrectly for
231
- executable files.
510
+ "git checkout [--detach] <commit>" was listed poorly in the
511
+ synopsis section of its documentation.
512
233
- Will merge to 'master' in the fourth batch.
513
+ Will merge to 'master' in the sixth batch.
514
515
516
* jk/trailing-slash-in-pathspec (2013-09-13) 2 commits
237
- - reset: handle submodule with trailing slash
238
- - rm: re-use parse_pathspec's trailing-slash removal
517
+ (merged to 'next' on 2013-09-17 at 18fe277)
518
+ + reset: handle submodule with trailing slash
519
+ + rm: re-use parse_pathspec's trailing-slash removal
520
521
Code refactoring.
522
242
- Will merge to 'next'.
523
+ Will merge to 'master' in the sixth batch.
524
525
526
* kb/msvc-compile (2013-09-11) 5 commits
246
- - Windows: do not redefine _WIN32_WINNT
247
- - MinGW: Fix stat definitions to work with MinGW runtime version 4.0
248
- - MSVC: fix stat definition hell
249
- - MSVC: fix compile errors due to macro redefinitions
250
- - MSVC: fix compile errors due to missing libintl.h
527
+ (merged to 'next' on 2013-09-17 at a9bcbb5)
528
+ + Windows: do not redefine _WIN32_WINNT
529
+ + MinGW: Fix stat definitions to work with MinGW runtime version 4.0
530
+ + MSVC: fix stat definition hell
531
+ + MSVC: fix compile errors due to macro redefinitions
532
+ + MSVC: fix compile errors due to missing libintl.h
533
534
Build updates for Windows port.
535
254
- Will merge to 'next'.
536
+ Will merge to 'master' in the sixth batch.
537
538
539
* lc/filter-branch-too-many-refs (2013-09-12) 1 commit
258
- - Allow git-filter-branch to process large repositories with lots of branches.
540
+ (merged to 'next' on 2013-09-17 at 31cd01a)
541
+ + Allow git-filter-branch to process large repositories with lots of branches.
542
543
"git filter-branch" in a repository with many refs blew limit of
544
command line length.
545
263
- Will merge to 'next'.
546
+ Will merge to 'master' in the sixth batch.
547
548
549
* mm/commit-template-squelch-advice-messages (2013-09-12) 3 commits
@@ -269,48 +552,19 @@ of the repositories listed at
552
+ wt-status: turn advice_status_hints into a field of wt_status
553
+ commit: factor status configuration is a helper function
554
272
- From the commit log template, remove irrelevant "advice" messages
273
- that are shared with "git status" output.
274
-
275
- Will merge to 'master' in the fifth batch.
276
-
277
-
278
-* np/lookup-object-hashing (2013-09-11) 1 commit
279
- (merged to 'next' on 2013-09-12 at d835ef6)
280
- + lookup_object: remove hashtable_index() and optimize hash_obj()
281
-
282
- Micro optimize hash function used in the object hash table.
283
-
284
- Will merge to 'master' in the fifth batch.
285
-
286
-
287
-* js/add-i-mingw (2013-09-04) 1 commit
288
- (merged to 'next' on 2013-09-10 at 50ab841)
289
- + add--interactive: fix external command invocation on Windows
290
-
291
- The implementation of "add -i" has a crippling code to work around
292
- ActiveState Perl limitation but it by mistake also triggered on Git
293
- for Windows where MSYS perl is used.
294
-
295
- Will merge to 'master' in the fourth batch.
555
+ From the commit log template, remove irrelevant "advice" messages
556
+ that are shared with "git status" output.
557
558
+ Will merge to 'master' in the fifth batch.
559
298
-* rh/ishes-doc (2013-09-04) 7 commits
299
- (merged to 'next' on 2013-09-10 at 3611e8a)
300
- + glossary: fix and clarify the definition of 'ref'
301
- + revisions.txt: fix and clarify <rev>^{<type>}
302
- + glossary: more precise definition of tree-ish (a.k.a. treeish)
303
- + use 'commit-ish' instead of 'committish'
304
- + use 'tree-ish' instead of 'treeish'
305
- + glossary: define commit-ish (a.k.a. committish)
306
- + glossary: mention 'treeish' as an alternative to 'tree-ish'
560
308
- We liberally use "committish" and "commit-ish" (and "treeish" and
309
- "tree-ish"); as these are non-words, let's unify these terms to
310
- their dashed form. More importantly, clarify the documentation on
311
- object peeling using these terms.
561
+* np/lookup-object-hashing (2013-09-11) 1 commit
562
+ (merged to 'next' on 2013-09-12 at d835ef6)
563
+ + lookup_object: remove hashtable_index() and optimize hash_obj()
564
+
565
+ Micro optimize hash function used in the object hash table.
566
313
- Will merge to 'master' in the fourth batch.
567
+ Will merge to 'master' in the fifth batch.
568
569
570
* bc/http-backend-allow-405 (2013-09-12) 1 commit
@@ -348,7 +602,9 @@ of the repositories listed at
602
Will merge to 'master' in the fifth batch.
603
604
351
-* jh/checkout-auto-tracking (2013-09-09) 5 commits
605
+* jh/checkout-auto-tracking (2013-09-17) 6 commits
606
+ (merged to 'next' on 2013-09-17 at 6748f49)
607
+ + t3200: fix failure on case-insensitive filesystems
608
(merged to 'next' on 2013-09-13 at 2aa1553)
609
+ branch.c: Relax unnecessary requirement on upstream's remote ref name
610
+ t3200: Add test demonstrating minor regression in 41c21f2
@@ -363,25 +619,16 @@ of the repositories listed at
619
Will merge to 'master' in the fifth batch.
620
621
366
-* jk/remove-remote-helpers-in-python (2013-09-09) 1 commit
367
- (merged to 'next' on 2013-09-10 at 49c7a74)
368
- + git_remote_helpers: remove little used Python library
369
-
370
- Remove now disused remote-helpers framework for helpers written in
371
- Python.
372
-
373
- Will merge to 'master' in the fourth batch.
374
-
375
-
622
* jk/upload-pack-keepalive (2013-09-09) 2 commits
377
- - upload-pack: bump keepalive default to 5 seconds
378
- - upload-pack: send keepalive packets during pack computation
623
+ (merged to 'next' on 2013-09-17 at d3141ac)
624
+ + upload-pack: bump keepalive default to 5 seconds
625
+ + upload-pack: send keepalive packets during pack computation
626
627
When running "fetch -q", a long silence while the sender side
628
computes the set of objects to send can be mistaken by proxies as
629
dropped connection.
630
384
- Will merge to 'next'.
631
+ Will merge to 'master' in the fifth batch.
632
633
634
* mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit
@@ -396,82 +643,18 @@ of the repositories listed at
643
Will merge to 'master' in the fifth batch.
644
645
399
-* ss/doclinks (2013-09-06) 1 commit
400
- (merged to 'next' on 2013-09-10 at 2d029a9)
401
- + Documentation: make AsciiDoc links always point to HTML files
402
-
403
- When we converted many documents that were traditionally text-only
404
- to be formatted to AsciiDoc, we did not update links that point at
405
- them to refer to the formatted HTML files.
406
-
407
- Will merge to 'master' in the fourth batch.
408
-
409
-
410
-* uh/git-svn-serf-fix (2013-09-06) 1 commit
411
- (merged to 'next' on 2013-09-13 at d65a9a1)
412
- + git-svn: fix termination issues for remote svn connections
413
-
414
- "git-svn" used with SVN 1.8.0 when talking over https:// connection
415
- dumped core due to a bug in the serf library that SVN uses. Work
416
- it around on our side, even though the SVN side is being fixed.
417
-
418
- Will merge to 'master' in the fourth batch.
419
-
420
-
421
-* fc/contrib-bzr-hg-fixes (2013-09-03) 10 commits
422
- (merged to 'next' on 2013-09-12 at f5e8684)
423
- + contrib/remote-helpers: quote variable references in redirection targets
424
- + contrib/remote-helpers: style updates for test scripts
425
- + remote-hg: use notes to keep track of Hg revisions
426
- + remote-helpers: cleanup more global variables
427
- + remote-helpers: trivial style fixes
428
- + remote-hg: improve basic test
429
- + remote-hg: add missing &&s in the test
430
- + remote-hg: fix test
431
- + remote-bzr: make bzr branches configurable per-repo
432
- + remote-bzr: fix export of utf-8 authors
433
-
434
- Will merge to 'master' in the fourth batch.
435
-
436
-
437
-* np/pack-v4 (2013-09-11) 88 commits
646
+* np/pack-v4 (2013-09-18) 90 commits
647
+ - packv4-parse.c: add tree offset caching
648
- t1050: replace one instance of show-index with verify-pack
649
- index-pack, pack-objects: allow creating .idx v2 with .pack v4
650
- unpack-objects: decode v4 trees
651
- unpack-objects: allow to save processed bytes to a buffer
442
- - unpack-objects: decode v4 commits
652
- ...
653
654
Nico and Duy advancing the eternal vaporware pack-v4. This is here
655
primarily for wider distribution of the preview edition.
656
657
449
-* jk/free-tree-buffer (2013-06-06) 1 commit
450
- (merged to 'next' on 2013-09-09 at 3576189)
451
- + clear parsed flag when we free tree buffers
452
-
453
- Will merge to 'master' in the fourth batch.
454
-
455
-
456
-* jk/has-sha1-file-retry-packed (2013-08-30) 1 commit
457
- (merged to 'next' on 2013-09-09 at fc42e9b)
458
- + has_sha1_file: re-check pack directory before giving up
459
-
460
- When an object is not found after checking the packfiles and then
461
- loose object directory, read_sha1_file() re-checks the packfiles to
462
- prevent racing with a concurrent repacker; teach the same logic to
463
- has_sha1_file().
464
-
465
- Will merge to 'master' in the fourth batch.
466
-
467
-
468
-* ab/gitweb-author-initials (2013-08-30) 1 commit
469
- (merged to 'next' on 2013-09-09 at ecb924d)
470
- + gitweb: Fix the author initials in blame for non-ASCII names
471
-
472
- Will merge to 'master' in the fourth batch.
473
-
474
-
658
* bk/refs-multi-update (2013-09-11) 8 commits
659
(merged to 'next' on 2013-09-13 at e6d21af)
660
+ update-ref: add test cases covering --stdin signature
@@ -502,69 +685,6 @@ of the repositories listed at
685
Will merge to 'master' in the fifth batch.
686
687
505
-* fc/fast-export (2013-09-03) 2 commits
506
- (merged to 'next' on 2013-09-09 at 8d5d396)
507
- + fast-export: refactor get_tags_and_duplicates()
508
- + fast-export: make extra_refs global
509
-
510
- Code simpification.
511
-
512
- Will merge to 'master' in the fourth batch.
513
-
514
-
515
-* fc/rev-parse-test-updates (2013-09-03) 4 commits
516
- (merged to 'next' on 2013-09-09 at 92c51ef)
517
- + rev-parse test: use standard test functions for setup
518
- + rev-parse test: use test_cmp instead of "test" builtin
519
- + rev-parse test: use test_must_fail, not "if <command>; then false; fi"
520
- + rev-parse test: modernize quoting and whitespace
521
-
522
- Modernize tests.
523
-
524
- Will merge to 'master' in the fourth batch.
525
-
526
-
527
-* fc/t3200-fixes (2013-09-03) 3 commits
528
- (merged to 'next' on 2013-09-09 at 3626363)
529
- + t: branch: fix broken && chains
530
- + t: branch: fix typo
531
- + t: branch: trivial style fix
532
-
533
- Will merge to 'master' in the fourth batch.
534
-
535
-
536
-* fc/trivial (2013-09-08) 5 commits
537
- (merged to 'next' on 2013-09-09 at a8ad2e1)
538
- + pull: use $curr_branch_short more
539
- + add: trivial style cleanup
540
- + reset: trivial style cleanup
541
- + branch: trivial style fix
542
- + reset: trivial refactoring
543
-
544
- Will merge to 'master' in the fourth batch.
545
-
546
-
547
-* jk/pager-bypass-cat-for-default-pager (2013-09-03) 1 commit
548
- (merged to 'next' on 2013-09-09 at c9cfbaa)
549
- + pager: turn on "cat" optimization for DEFAULT_PAGER
550
-
551
- If a build-time fallback is set to "cat" instead of "less", we
552
- should apply the same "no subprocess or pipe" optimization as we
553
- apply to user-supplied GIT_PAGER=cat.
554
-
555
- Will merge to 'master' in the fourth batch.
556
-
557
-
558
-* nd/git-dir-pointing-at-gitfile (2013-09-03) 1 commit
559
- (merged to 'next' on 2013-09-09 at 5b0a4bf)
560
- + Make setup_git_env() resolve .git file when $GIT_DIR is not specified
561
-
562
- We made sure that we notice the user-supplied GIT_DIR is actually a
563
- gitfile, but failed to do so when the default ".git" is a gitfile.
564
-
565
- Will merge to 'master' in the fourth batch.
566
-
567
-
688
* nr/git-cd-to-a-directory (2013-09-09) 1 commit
689
(merged to 'next' on 2013-09-13 at 2b07af9)
690
+ git: run in a directory given with -C option
@@ -587,14 +707,15 @@ of the repositories listed at
707
708
709
* cc/replace-with-the-same-type (2013-09-09) 8 commits
590
- - Doc: 'replace' merge and non-merge commits
591
- - t6050-replace: use some long option names
592
- - replace: allow long option names
593
- - Documentation/replace: add Creating Replacement Objects section
594
- - t6050-replace: add test to clean up all the replace refs
595
- - t6050-replace: test that objects are of the same type
596
- - Documentation/replace: state that objects must be of the same type
597
- - replace: forbid replacing an object with one of a different type
710
+ (merged to 'next' on 2013-09-17 at 34b5bb7)
711
+ + Doc: 'replace' merge and non-merge commits
712
+ + t6050-replace: use some long option names
713
+ + replace: allow long option names
714
+ + Documentation/replace: add Creating Replacement Objects section
715
+ + t6050-replace: add test to clean up all the replace refs
716
+ + t6050-replace: test that objects are of the same type
717
+ + Documentation/replace: state that objects must be of the same type
718
+ + replace: forbid replacing an object with one of a different type
719
720
Using the replace mechanism to swap an object with another object
721
of a different type can introduce inconsistency (e.g. a tree
@@ -602,21 +723,12 @@ of the repositories listed at
723
be mistakenly or maliciously replaced with an object with a
724
different type). Attempt to forbid such.
725
605
- Will merge to 'next'.
606
-
607
-
608
-* jx/clean-interactive (2013-08-28) 1 commit
609
- (merged to 'next' on 2013-09-09 at 477fec6)
610
- + documentation: clarify notes for clean.requireForce
611
- (this branch is used by jx/relative-path-regression-fix.)
612
-
613
- Finishing touches to update the document to adjust to a new option
614
- "git clean" learned recently.
726
+ Will merge to 'master' in the sixth batch.
727
616
- Will merge to 'master' in the fourth batch.
728
618
-
619
-* mm/status-without-comment-char (2013-09-06) 6 commits
729
+* mm/status-without-comment-char (2013-09-17) 7 commits
730
+ (merged to 'next' on 2013-09-17 at d93e7c1)
731
+ + t7508: avoid non-portable sed expression
732
(merged to 'next' on 2013-09-12 at 89161b8)
733
+ status: add missing blank line after list of "other" files
734
+ tests: don't set status.displayCommentPrefix file-wide
@@ -646,106 +758,14 @@ of the repositories listed at
758
Will cook in 'next' a bit.
759
760
649
-* jk/duplicate-objects-in-packs (2013-09-04) 5 commits
650
- (merged to 'next' on 2013-09-09 at 72f2c3d)
651
- + t5308: check that index-pack --strict detects duplicate objects
652
- + test index-pack on packs with recoverable delta cycles
653
- + add tests for indexing packs with delta cycles
654
- + sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP
655
- + test-sha1: add a binary output mode
656
-
657
- A packfile that stores the same object more than once is broken and
658
- will be rejected.
659
-
660
- Will merge to 'master' in the fourth batch.
661
-
662
-
663
-* dw/diff-no-index-doc (2013-08-28) 2 commits
664
- (merged to 'next' on 2013-09-10 at 423c8f6)
665
- + diff --no-index: describe in a separate paragraph
666
- + diff --no-index: clarify operation when not inside a repository
667
-
668
- When the user types "git diff" outside a working tree, thinking he
669
- is inside one, the current error message that is a single-liner
670
- "usage: git diff --no-index <path> <path>" may not be sufficient to
671
- make him realize the mistake. Add "Not a git repository" to the
672
- error message when we fell into the "--no-index" mode without an
673
- explicit command line option to instruct us to do so.
674
-
675
- Will merge to 'master' in the fourth batch.
676
-
677
-
678
-* sb/repack-in-c (2013-08-30) 2 commits
761
+* sb/repack-in-c (2013-09-17) 3 commits
762
+ - repack: improve warnings about failure of renaming and removing files
763
- repack: retain the return value of pack-objects
764
- repack: rewrite the shell script in C
765
682
- Any further reviews?
683
-
684
-
685
-* ap/commit-author-mailmap (2013-08-24) 1 commit
686
- (merged to 'next' on 2013-09-09 at 79d5a20)
687
- + commit: search author pattern against mailmap
688
-
689
- "git commit --author=$name", when $name is not in the canonical
690
- "A. U. Thor <au.thor@example.xz>" format, looks for a matching name
691
- from existing history, but did not consult mailmap to grab the
692
- preferred author name.
693
-
694
- Will merge to 'master' in the fourth batch.
695
-
696
-
697
-* jk/write-broken-index-with-nul-sha1 (2013-08-28) 1 commit
698
- (merged to 'next' on 2013-09-09 at 6953f27)
699
- + write_index: optionally allow broken null sha1s
700
-
701
- Earlier we started rejecting an attempt to add 0{40} object name to
702
- the index and to tree objects, but it sometimes is necessary to
703
- allow so to be able to use tools like filter-branch to correct such
704
- broken tree objects.
705
-
706
- Will merge to 'master' in the fourth batch.
707
-
708
-
709
-* kk/tests-with-no-perl (2013-08-24) 4 commits
710
- (merged to 'next' on 2013-09-09 at 67510b1)
711
- + reset test: modernize style
712
- + t/t7106-reset-unborn-branch.sh: Add PERL prerequisite
713
- + add -i test: use skip_all instead of repeated PERL prerequisite
714
- + Make test "using invalid commit with -C" more strict
715
-
716
- Some tests were not skipped under NO_PERL build.
717
-
718
- Will merge to 'master' in the fourth batch.
719
-
720
-
721
-* ta/user-manual (2013-08-27) 11 commits
722
- (merged to 'next' on 2013-09-10 at 1361be1)
723
- + "git prune" is safe
724
- + Remove irrelevant reference from "Tying it all together"
725
- + Remove unnecessary historical note from "Object storage format"
726
- + Improve section "Merging multiple trees"
727
- + Improve section "Manipulating branches"
728
- + Simplify "How to make a commit"
729
- + Fix some typos and improve wording
730
- + Use "git merge" instead of "git pull ."
731
- + Use current output for "git repack"
732
- + Use current "detached HEAD" message
733
- + Call it "Git User Manual" and remove reference to very old Git version
734
-
735
- Update the user's manual to more recent versions of Git.
736
-
737
- Will merge to 'master' in the fourth batch.
738
-
739
-
740
-* tb/precompose-autodetect-fix (2013-08-27) 1 commit
741
- (merged to 'next' on 2013-09-09 at 9bfdac1)
742
- + Set core.precomposeunicode to true on e.g. HFS+
743
-
744
- On MacOS X, we detected if the filesystem needs the "pre-composed
745
- unicode strings" workaround, but did not automatically enable it.
746
- Now we do.
766
+ Rerolled, and I think it is in a reasonably good shape.
767
748
- Will merge to 'master' in the fourth batch.
768
+ Will merge to 'next'.
769
770
771
* jx/branch-vv-always-compare-with-upstream (2013-08-26) 2 commits
@@ -778,16 +798,6 @@ of the repositories listed at
798
Will merge to 'master' in the fifth batch.
799
800
781
-* ks/p4-view-spec (2013-09-03) 2 commits
782
- (merged to 'next' on 2013-09-10 at 8ceb2ec)
783
- + git p4: implement view spec wildcards with "p4 where"
784
- + git p4 test: sanitize P4CHARSET
785
-
786
- Replaced with a reroll that was whitespace damaged.
787
-
788
- Will merge to 'master' in the fourth batch.
789
-
790
-
801
* tr/merge-recursive-index-only (2013-07-07) 3 commits
802
- merge-recursive: -Xindex-only to leave worktree unchanged
803
- merge-recursive: untangle double meaning of o->call_depth