What's cooking (2013/09 #06)
Junio C Hamano committed
Sep 20, 2013 at 14:11 UTC
fbf94fdd039ab417ef309eff8da1693fd5f5edb6
1 file changed
+282
-516
whats-cooking.txt
+282
-516
@@ -1,17 +1,24 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2013, #05; Wed, 18)
4
-X-master-at: eeaee045c85719821e685a22603a645a0ea85bad
5
-X-next-at: d97bfe6d8d1499241374e46954d566a3af3b8087
3
+Subject: What's cooking in git.git (Sep 2013, #06; Fri, 20)
4
+X-master-at: 128a96c98442524c7f2eeef4757b1e48445f24ce
5
+X-next-at: 0d6e0ce2a5090eb3c05a624d1ad584a1153fcc52
6
7
-What's cooking in git.git (Sep 2013, #05; Wed, 18)
7
+What's cooking in git.git (Sep 2013, #06; Fri, 20)
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 fourth batch of topics are in 'master'.
14
+The fifth batch of topics are in 'master'. We are about to pass 350
15
+non-merge commits since the last release, which means we are about
16
+halfway there for the next one. Among ~60 contributors who have
17
+commits in the 'master' branch since v1.8.4, ~10 are new faces.
18
+
19
+I'll be offline starting next week for a few weeks; in order to
20
+improve the "bus factor", I asked Jonathan Nieder to fill in for me
21
+as an interim maintainer, with Peff as a back-up.
22
23
You can find the changes described here in the integration branches
24
of the repositories listed at
@@ -21,366 +28,227 @@ of the repositories listed at
28
--------------------------------------------------
29
[Graduated to "master"]
30
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
-
74
-
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
-
82
-
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
-
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
-
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
-
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
-
113
- "git cvsserver" computed the permission mode bits incorrectly for
114
- executable files.
115
-
116
-
117
-* jc/url-match (2013-09-12) 1 commit
118
- (merged to 'next' on 2013-09-13 at 7b94f8e)
119
- + urlmatch.c: recompute pointer after append_normalized_escapes
120
-
121
- While normalizing a URL, we forgot that the buffer that holds it
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
-
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.
31
+* bc/http-backend-allow-405 (2013-09-12) 1 commit
32
+ (merged to 'next' on 2013-09-12 at bc1719f)
33
+ + http-backend: provide Allow header for 405
34
35
+ When the webserver responds with "405 Method Not Allowed", it
36
+ should tell the client what methods are allowed with the "Allow"
37
+ header.
38
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
39
40
+* bk/refs-multi-update (2013-09-11) 8 commits
41
+ (merged to 'next' on 2013-09-13 at e6d21af)
42
+ + update-ref: add test cases covering --stdin signature
43
+ + update-ref: support multiple simultaneous updates
44
+ + refs: add update_refs for multiple simultaneous updates
45
+ + refs: add function to repack without multiple refs
46
+ + refs: factor delete_ref loose ref step into a helper
47
+ + refs: factor update_ref steps into helpers
48
+ + refs: report ref type from lock_any_ref_for_update
49
+ + reset: rename update_refs to reset_refs
50
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
51
+ Give "update-refs" a "--stdin" option to read multiple update
52
+ requests and perform them in an all-or-none fashion.
53
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().
54
55
+* dw/check-ignore-sans-index (2013-09-12) 1 commit
56
+ (merged to 'next' on 2013-09-13 at 8daec3c)
57
+ + check-ignore: Add option to ignore index contents
58
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
59
+ "git check-ignore" follows the same rule as "git add" and "git
60
+ status" in that the ignore/exclude mechanism does not take effect
61
+ on paths that are already tracked. With "--no-index" option, it
62
+ can be used to diagnose which paths that should have been ignored
63
+ have been mistakenly added to the index.
64
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.
65
66
+* fc/at-head (2013-09-12) 2 commits
67
+ (merged to 'next' on 2013-09-13 at d3800c2)
68
+ + Add new @ shortcut for HEAD
69
+ + sha1-name: pass len argument to interpret_branch_name()
70
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
71
+ Attempt to resurrect "Type @ for HEAD"; the bottom one seems to be
72
+ a genuine code improvement, but identifying cases where "@" means
73
+ HEAD were harder than it should have been. I think the result of
74
+ squashing the tip one in covers all the necessary cases.
75
166
- Remove now disused remote-helpers framework for helpers written in
167
- Python.
76
77
+* hu/cherry-pick-previous-branch (2013-09-09) 1 commit
78
+ (merged to 'next' on 2013-09-12 at 36e4d9b)
79
+ + cherry-pick: allow "-" as abbreviation of '@{-1}'
80
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
81
+ Just like "git checkout -" knows to check out and "git merge -"
82
+ knows to merge the branch you were previously on, teach "git
83
+ cherry-pick" to understand "-" as the previous branch.
84
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.
85
86
+* jh/checkout-auto-tracking (2013-09-17) 6 commits
87
+ (merged to 'next' on 2013-09-17 at 6748f49)
88
+ + t3200: fix failure on case-insensitive filesystems
89
+ (merged to 'next' on 2013-09-13 at 2aa1553)
90
+ + branch.c: Relax unnecessary requirement on upstream's remote ref name
91
+ + t3200: Add test demonstrating minor regression in 41c21f2
92
+ + Refer to branch.<name>.remote/merge when documenting --track
93
+ + t3200: Minor fix when preparing for tracking failure
94
+ + t2024: Fix &&-chaining and a couple of typos
95
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
96
+ Fix a minor regression in v1.8.3.2 and later that made it
97
+ impossible to base your local work on anything but a local branch
98
+ of the upstream repository you are tracking from.
99
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.
100
101
+* jk/upload-pack-keepalive (2013-09-09) 2 commits
102
+ (merged to 'next' on 2013-09-17 at d3141ac)
103
+ + upload-pack: bump keepalive default to 5 seconds
104
+ + upload-pack: send keepalive packets during pack computation
105
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.)
106
+ When running "fetch -q", a long silence while the sender side
107
+ computes the set of objects to send can be mistaken by proxies as
108
+ dropped connection.
109
194
- Finishing touches to update the document to adjust to a new option
195
- "git clean" learned recently.
110
111
+* jx/branch-vv-always-compare-with-upstream (2013-08-26) 2 commits
112
+ (merged to 'next' on 2013-09-12 at b5c37f4)
113
+ + status: always show tracking branch even no change
114
+ + branch: report invalid tracking branch as gone
115
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
116
+ "git branch -v -v" (and "git status") did not distinguish among a
117
+ branch that does not build on any other branch, a branch that is in
118
+ sync with the branch it builds on, and a branch that is configured
119
+ to build on some other branch that no longer exists.
120
205
- Some tests were not skipped under NO_PERL build.
121
122
+* mm/commit-template-squelch-advice-messages (2013-09-12) 3 commits
123
+ (merged to 'next' on 2013-09-13 at 410d207)
124
+ + commit: disable status hints when writing to COMMIT_EDITMSG
125
+ + wt-status: turn advice_status_hints into a field of wt_status
126
+ + commit: factor status configuration is a helper function
127
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
128
+ From the commit log template, remove irrelevant "advice" messages
129
+ that are shared with "git status" output.
130
213
- Replaced with a reroll that was whitespace damaged.
131
132
+* mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit
133
+ (merged to 'next' on 2013-09-13 at 82e8b91)
134
+ + rebase: fix run_specific_rebase's use of "return" on FreeBSD
135
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
136
+ Work around a bug in FreeBSD shell that caused a regression to "git
137
+ rebase" in v1.8.4. May need to be later applied to 'maint'.
138
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.
139
140
+* mm/status-without-comment-char (2013-09-17) 7 commits
141
+ (merged to 'next' on 2013-09-17 at d93e7c1)
142
+ + t7508: avoid non-portable sed expression
143
+ (merged to 'next' on 2013-09-12 at 89161b8)
144
+ + status: add missing blank line after list of "other" files
145
+ + tests: don't set status.displayCommentPrefix file-wide
146
+ + status: disable display of '#' comment prefix by default
147
+ + submodule summary: ignore --for-status option
148
+ + wt-status: use argv_array API
149
+ + builtin/stripspace.c: fix broken indentation
150
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'
151
+ Allow "git status" to omit the prefix to make its output a comment
152
+ in a commit log editor, which is not necessary for human
153
+ consumption.
154
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.
155
+ We may want to tighten the output to omit unnecessary trailing
156
+ blank lines, but that does not have to be in the scope of this
157
+ series.
158
159
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
160
+* nd/fetch-into-shallow (2013-08-28) 7 commits
161
+ (merged to 'next' on 2013-09-09 at 87a3b99)
162
+ + Add testcase for needless objects during a shallow fetch
163
+ + list-objects: mark more commits as edges in mark_edges_uninteresting
164
+ + list-objects: reduce one argument in mark_edges_uninteresting
165
+ + upload-pack: delegate rev walking in shallow fetch to pack-objects
166
+ + shallow: add setup_temporary_shallow()
167
+ + shallow: only add shallow graft points to new shallow file
168
+ + move setup_alternate_shallow and write_shallow_commits to shallow.c
169
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.
170
+ When there is no sufficient overlap between old and new history
171
+ during a fetch into a shallow repository, we unnecessarily sent
172
+ objects the sending side knows the receiving end has.
173
174
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
175
+* np/lookup-object-hashing (2013-09-11) 1 commit
176
+ (merged to 'next' on 2013-09-12 at d835ef6)
177
+ + lookup_object: remove hashtable_index() and optimize hash_obj()
178
263
- Update the user's manual to more recent versions of Git.
179
+ Micro optimize hash function used in the object hash table.
180
181
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+
182
+* nr/git-cd-to-a-directory (2013-09-19) 2 commits
183
+ (merged to 'next' on 2013-09-19 at e9394e8)
184
+ + t0056: "git -C" test updates
185
+ (merged to 'next' on 2013-09-13 at 2b07af9)
186
+ + git: run in a directory given with -C option
187
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.
188
+ Just like "make -C <directory>", make "git -C <directory> ..." to
189
+ go there before doing anything else.
190
191
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
192
+* rh/peeling-tag-to-tag (2013-09-03) 2 commits
193
+ (merged to 'next' on 2013-09-12 at 3a1d906)
194
+ + peel_onion: do not assume length of x_type globals
195
+ + peel_onion(): add support for <rev>^{tag}
196
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.
197
+ Make "foo^{tag}" to peel a tag to itself, i.e. no-op., and fail if
198
+ "foo" is not a tag.
199
200
--------------------------------------------------
201
[New Topics]
202
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.
203
+* jc/revision-range-unpeel (2013-09-20) 2 commits
204
+ - (possible fixup) jc/revision-range-unpeel - peel only when necessary
205
+ - revision: do not peel tags used in range notation
206
337
- Will merge to 'next'.
207
+ "git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the
208
+ output, but "git rev-list --objects v1.0^..v1.0" did not.
209
210
+ Need to decide either squashing the top fixup in, or dropping it
211
+ and then merge to 'next'.
212
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
213
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.
214
+* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
215
+ - perf-lib: add test_perf_cleanup target
216
+ - perf-lib: split starting the test from the execution
217
349
- Will merge to 'next'.
218
+ Add test_perf_cleanup shell function to the perf suite, that allows
219
+ the script writers to define a test with a clean-up action.
220
221
+ Will hold, until we get any user.
222
352
-* nd/fetch-pack-error-reporting-fix (2013-09-18) 1 commit
353
- - fetch-pack.c: show correct command name that fails
223
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.
224
+* jc/push-cas (2013-09-20) 1 commit
225
+ (merged to 'next' on 2013-09-20 at 5e1e7cc)
226
+ + t5541: mark passing c-a-s test as success
227
359
- Will merge to 'next'.
228
+ A trivial fix to a test.
229
230
+ Will merge to 'master'.
231
362
-* sg/complete-untracked-filter (2013-09-18) 1 commit
363
- - completion: improve untracked directory filtering for filename completion
232
365
- Will merge to 'next'.
233
+* jk/format-patch-from (2013-09-20) 1 commit
234
+ (merged to 'next' on 2013-09-20 at 0506530)
235
+ + format-patch: print in-body "From" only when needed
236
237
+ "format-patch --from=<whom>" forgot to omit unnecessary in-body
238
+ from line, i.e. when <whom> is the same as the real author.
239
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'.
240
+ Will merge to 'master'.
241
242
+--------------------------------------------------
243
+[Stalled]
244
377
-* jk/shortlog-tolerate-broken-commit (2013-09-18) 1 commit
378
- - shortlog: ignore commits with missing authors
245
+* tr/merge-recursive-index-only (2013-07-07) 3 commits
246
+ - merge-recursive: -Xindex-only to leave worktree unchanged
247
+ - merge-recursive: untangle double meaning of o->call_depth
248
+ - merge-recursive: remove dead conditional in update_stages()
249
380
- Will merge to 'next'.
250
+ Will hold, until we get any user.
251
382
---------------------------------------------------
383
-[Stalled]
252
253
* jc/ref-excludes (2013-09-03) 2 commits
254
- document --exclude option
@@ -483,9 +351,113 @@ of the repositories listed at
351
--------------------------------------------------
352
[Cooking]
353
486
-* jx/relative-path-regression-fix (2013-09-13) 3 commits
354
+* es/name-hash-no-trailing-slash-in-dirs (2013-09-17) 4 commits
355
+ (merged to 'next' on 2013-09-20 at 9633d9a)
356
+ + dir: revert work-around for retired dangerous behavior
357
+ + name-hash: stop storing trailing '/' on paths in index_state.dir_hash
358
+ + employ new explicit "exists in index?" API
359
+ + name-hash: refactor polymorphic index_name_exists()
360
+
361
+ Clean up the internal of the name-hash mechanism used to work
362
+ around case insensitivity on some filesystems to cleanly fix a
363
+ long-standing API glitch where the caller of cache_name_exists()
364
+ that ask about a directory with a counted string was required to
365
+ have '/' at one location past the end of the string.
366
+
367
+ Will merge to 'master'.
368
+
369
+
370
+* po/dot-url (2013-09-13) 2 commits
371
+ (merged to 'next' on 2013-09-20 at 6a12786)
372
+ + config doc: update dot-repository notes
373
+ + doc: command line interface (cli) dot-repository dwimmery
374
+
375
+ Explain how '.' can be used to refer to the "current repository"
376
+ in the documentation.
377
+
378
+ Will merge to 'master'.
379
+
380
+
381
+* es/contacts-in-subdir (2013-09-17) 1 commit
382
+ (merged to 'next' on 2013-09-20 at d67164f)
383
+ + contacts: fix to work in subdirectories
384
+
385
+ Allow the contacts (in contrib/) script to run from inside a
386
+ subdirectory.
387
+
388
+ Will merge to 'master'.
389
+
390
+
391
+* jc/upload-pack-send-symref (2013-09-17) 7 commits
392
+ - clone: test the new HEAD detection logic
393
+ - connect: annotate refs with their symref information in get_remote_head()
394
+ - connect.c: make parse_feature_value() static
395
+ - upload-pack: send non-HEAD symbolic refs
396
+ - upload-pack: send symbolic ref information as capability
397
+ - upload-pack.c: do not pass confusing cb_data to mark_our_ref()
398
+ - t5505: fix "set-head --auto with ambiguous HEAD" test
399
+
400
+ One long-standing flaw in the pack transfer protocol used by "git
401
+ clone" was that there was no way to tell the other end which branch
402
+ "HEAD" points at, and the receiving end needed to guess. A new
403
+ capability has been defined in the pack protocol to convey this
404
+ information so that cloning from a repository with more than one
405
+ branches pointing at the same commit where the HEAD is at now
406
+ reliably sets the initial branch in the resulting repository.
407
+
408
+ Will merge to 'next'.
409
+
410
+
411
+* jk/clone-progress-to-stderr (2013-09-18) 3 commits
412
+ - clone: always set transport options
413
+ - clone: treat "checking connectivity" like other progress
414
+ - clone: send diagnostic messages to stderr
415
+
416
+ Some progress and diagnostic messages from "git clone" were
417
+ incorrectly sent to the standard output stream, not to the standard
418
+ error stream.
419
+
420
+ Will merge to 'next'.
421
+
422
+
423
+* nd/fetch-pack-error-reporting-fix (2013-09-18) 1 commit
424
+ (merged to 'next' on 2013-09-20 at fefa04f)
425
+ + fetch-pack.c: show correct command name that fails
426
+
427
+ When "fetch-pack" detected an error from spawned "index-pack" or
428
+ "unpack-objects", it did not report the failed program name
429
+ correctly when a shallow repository is involved.
430
+
431
+ Will merge to 'master'.
432
+
433
+
434
+* sg/complete-untracked-filter (2013-09-19) 1 commit
435
+ (merged to 'next' on 2013-09-20 at 798d0b9)
436
+ + completion: improve untracked directory filtering for filename completion
437
+
438
+ Will merge to 'master'.
439
+
440
+
441
+* jc/strcasecmp-pure-inline (2013-09-12) 1 commit
442
+ (merged to 'next' on 2013-09-20 at 7142d08)
443
+ + mailmap: work around implementations with pure inline strcasecmp
444
+
445
+ Work around MinGW <string.h> header that does not declare strcasecmp
446
+ whose address cannot be taken.
447
+
448
+ Will merge to 'master'.
449
+
450
+
451
+* jk/shortlog-tolerate-broken-commit (2013-09-18) 1 commit
452
+ (merged to 'next' on 2013-09-20 at 9c85c02)
453
+ + shortlog: ignore commits with missing authors
454
+
455
+ Will merge to 'master'.
456
+
457
+
458
+* jx/relative-path-regression-fix (2013-09-20) 3 commits
459
- Use simpler relative_path when set_git_dir
488
- - relative_path should honor dos_drive_prefix
460
+ - relative_path should honor dos-driver-prefix
461
- test: use unambigous leading path (/foo) for mingw
462
463
Waiting for the review to settle.
@@ -500,7 +472,7 @@ of the repositories listed at
472
even when it ends up using in-core copy that it got by reading from
473
the pack (at which point the checksum was validated).
474
503
- Will merge to 'master' in the sixth batch.
475
+ Will merge to 'master'.
476
477
478
* jc/checkout-detach-doc (2013-09-11) 1 commit
@@ -510,7 +482,7 @@ of the repositories listed at
482
"git checkout [--detach] <commit>" was listed poorly in the
483
synopsis section of its documentation.
484
513
- Will merge to 'master' in the sixth batch.
485
+ Will merge to 'master'.
486
487
488
* jk/trailing-slash-in-pathspec (2013-09-13) 2 commits
@@ -520,7 +492,7 @@ of the repositories listed at
492
493
Code refactoring.
494
523
- Will merge to 'master' in the sixth batch.
495
+ Will merge to 'master'.
496
497
498
* kb/msvc-compile (2013-09-11) 5 commits
@@ -533,7 +505,7 @@ of the repositories listed at
505
506
Build updates for Windows port.
507
536
- Will merge to 'master' in the sixth batch.
508
+ Will merge to 'master'.
509
510
511
* lc/filter-branch-too-many-refs (2013-09-12) 1 commit
@@ -543,104 +515,7 @@ of the repositories listed at
515
"git filter-branch" in a repository with many refs blew limit of
516
command line length.
517
546
- Will merge to 'master' in the sixth batch.
547
-
548
-
549
-* mm/commit-template-squelch-advice-messages (2013-09-12) 3 commits
550
- (merged to 'next' on 2013-09-13 at 410d207)
551
- + commit: disable status hints when writing to COMMIT_EDITMSG
552
- + wt-status: turn advice_status_hints into a field of wt_status
553
- + commit: factor status configuration is a helper function
554
-
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
-
560
-
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
-
567
- Will merge to 'master' in the fifth batch.
568
-
569
-
570
-* bc/http-backend-allow-405 (2013-09-12) 1 commit
571
- (merged to 'next' on 2013-09-12 at bc1719f)
572
- + http-backend: provide Allow header for 405
573
-
574
- When the webserver responds with "405 Method Not Allowed", it
575
- should tell the client what methods are allowed with the "Allow"
576
- header.
577
-
578
- Will merge to 'master' in the fifth batch.
579
-
580
-
581
-* dw/check-ignore-sans-index (2013-09-12) 1 commit
582
- (merged to 'next' on 2013-09-13 at 8daec3c)
583
- + check-ignore: Add option to ignore index contents
584
-
585
- "git check-ignore" follows the same rule as "git add" and "git
586
- status" in that the ignore/exclude mechanism does not take effect
587
- on paths that are already tracked. With "--no-index" option, it
588
- can be used to diagnose which paths that should have been ignored
589
- have been mistakenly added to the index.
590
-
591
- Will merge to 'master' in the fifth batch.
592
-
593
-
594
-* hu/cherry-pick-previous-branch (2013-09-09) 1 commit
595
- (merged to 'next' on 2013-09-12 at 36e4d9b)
596
- + cherry-pick: allow "-" as abbreviation of '@{-1}'
597
-
598
- Just like "git checkout -" knows to check out and "git merge -"
599
- knows to merge the branch you were previously on, teach "git
600
- cherry-pick" to understand "-" as the previous branch.
601
-
602
- Will merge to 'master' in the fifth batch.
603
-
604
-
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
611
- + Refer to branch.<name>.remote/merge when documenting --track
612
- + t3200: Minor fix when preparing for tracking failure
613
- + t2024: Fix &&-chaining and a couple of typos
614
-
615
- Fix a minor regression in v1.8.3.2 and later that made it
616
- impossible to base your local work on anything but a local branch
617
- of the upstream repository you are tracking from.
618
-
619
- Will merge to 'master' in the fifth batch.
620
-
621
-
622
-* jk/upload-pack-keepalive (2013-09-09) 2 commits
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
-
631
- Will merge to 'master' in the fifth batch.
632
-
633
-
634
-* mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit
635
- (merged to 'next' on 2013-09-13 at 82e8b91)
636
- + rebase: fix run_specific_rebase's use of "return" on FreeBSD
637
-
638
- Work around a bug in FreeBSD shell that caused a regression to "git
639
- rebase" in v1.8.4. It would be lovely to hear from FreeBSD folks a
640
- success report to make sure we didn't miss any other use of a bare
641
- "return" from dot-sourced script.
642
-
643
- Will merge to 'master' in the fifth batch.
518
+ Will merge to 'master'.
519
520
521
* np/pack-v4 (2013-09-18) 90 commits
@@ -655,57 +530,6 @@ of the repositories listed at
530
primarily for wider distribution of the preview edition.
531
532
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
661
- + update-ref: support multiple simultaneous updates
662
- + refs: add update_refs for multiple simultaneous updates
663
- + refs: add function to repack without multiple refs
664
- + refs: factor delete_ref loose ref step into a helper
665
- + refs: factor update_ref steps into helpers
666
- + refs: report ref type from lock_any_ref_for_update
667
- + reset: rename update_refs to reset_refs
668
-
669
- Give "update-refs" a "--stdin" option to read multiple update
670
- requests and perform them in an all-or-none fashion.
671
-
672
- Will merge to 'master' in the fifth batch.
673
-
674
-
675
-* fc/at-head (2013-09-12) 2 commits
676
- (merged to 'next' on 2013-09-13 at d3800c2)
677
- + Add new @ shortcut for HEAD
678
- + sha1-name: pass len argument to interpret_branch_name()
679
-
680
- Attempt to resurrect "Type @ for HEAD"; the bottom one seems to be
681
- a genuine code improvement, but identifying cases where "@" means
682
- HEAD were harder than it should have been. I think the result of
683
- squashing the tip one in covers all the necessary cases.
684
-
685
- Will merge to 'master' in the fifth batch.
686
-
687
-
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
691
-
692
- Just like "make -C <directory>", make "git -C <directory> ..." to
693
- go there before doing anything else.
694
-
695
- Will merge to 'master' in the fifth batch.
696
-
697
-
698
-* rh/peeling-tag-to-tag (2013-09-03) 2 commits
699
- (merged to 'next' on 2013-09-12 at 3a1d906)
700
- + peel_onion: do not assume length of x_type globals
701
- + peel_onion(): add support for <rev>^{tag}
702
-
703
- Make "foo^{tag}" to peel a tag to itself, i.e. no-op., and fail if
704
- "foo" is not a tag.
705
-
706
- Will merge to 'master' in the fifth batch.
707
-
708
-
533
* cc/replace-with-the-same-type (2013-09-09) 8 commits
534
(merged to 'next' on 2013-09-17 at 34b5bb7)
535
+ Doc: 'replace' merge and non-merge commits
@@ -723,29 +547,7 @@ of the repositories listed at
547
be mistakenly or maliciously replaced with an object with a
548
different type). Attempt to forbid such.
549
726
- Will merge to 'master' in the sixth batch.
727
-
728
-
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
735
- + status: disable display of '#' comment prefix by default
736
- + submodule summary: ignore --for-status option
737
- + wt-status: use argv_array API
738
- + builtin/stripspace.c: fix broken indentation
739
-
740
- Allow "git status" to omit the prefix to make its output a comment
741
- in a commit log editor, which is not necessary for human
742
- consumption.
743
-
744
- We may want to tighten the output to omit unnecessary trailing
745
- blank lines, but that does not have to be in the scope of this
746
- series.
747
-
748
- Will merge to 'master' in the fifth batch.
550
+ Will merge to 'master'.
551
552
553
* bc/submodule-status-ignored (2013-09-11) 3 commits
@@ -755,7 +557,7 @@ of the repositories listed at
557
+ submodule: don't print status output with ignore=all
558
+ submodule: fix confusing variable name
559
758
- Will cook in 'next' a bit.
560
+ Will merge to 'master'.
561
562
563
* sb/repack-in-c (2013-09-17) 3 commits
@@ -768,44 +570,6 @@ of the repositories listed at
570
Will merge to 'next'.
571
572
771
-* jx/branch-vv-always-compare-with-upstream (2013-08-26) 2 commits
772
- (merged to 'next' on 2013-09-12 at b5c37f4)
773
- + status: always show tracking branch even no change
774
- + branch: report invalid tracking branch as gone
775
-
776
- "git branch -v -v" (and "git status") did not distinguish among a
777
- branch that does not build on any other branch, a branch that is in
778
- sync with the branch it builds on, and a branch that is configured
779
- to build on some other branch that no longer exists.
780
-
781
- Will merge to 'master' in the fifth batch.
782
-
783
-
784
-* nd/fetch-into-shallow (2013-08-28) 7 commits
785
- (merged to 'next' on 2013-09-09 at 87a3b99)
786
- + Add testcase for needless objects during a shallow fetch
787
- + list-objects: mark more commits as edges in mark_edges_uninteresting
788
- + list-objects: reduce one argument in mark_edges_uninteresting
789
- + upload-pack: delegate rev walking in shallow fetch to pack-objects
790
- + shallow: add setup_temporary_shallow()
791
- + shallow: only add shallow graft points to new shallow file
792
- + move setup_alternate_shallow and write_shallow_commits to shallow.c
793
-
794
- When there is no sufficient overlap between old and new history
795
- during a fetch into a shallow repository, we unnecessarily sent
796
- objects the sending side knows the receiving end has.
797
-
798
- Will merge to 'master' in the fifth batch.
799
-
800
-
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
804
- - merge-recursive: remove dead conditional in update_stages()
805
-
806
- Will hold, until we get any user.
807
-
808
-
573
* jc/reflog-doc (2013-06-19) 1 commit
574
- setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
575
@@ -814,6 +578,8 @@ of the repositories listed at
578
is a leaf user that does not call out to or dot-sources other
579
scripts, so fixing it is not all that urgent.
580
581
+ Will merge to 'next'.
582
+
583
584
* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
585
- git add: -u/-A now affects the entire working tree