What's cooking (2013/06 #05)
Junio C Hamano committed
Jun 15, 2013 at 22:28 UTC
27ef8a5faaf9d26847b59acd52c756fba19a6b12
1 file changed
+343
-425
whats-cooking.txt
+343
-425
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2013, #04; Tue, 11)
4
-X-master-at: 4d1c565e1fb4e76c391448cdf85fe7c132bbb390
5
-X-next-at: 3b07823faafc941f5079443779265b5ba32c8407
3
+Subject: What's cooking in git.git (Jun 2013, #05; Sat, 15)
4
+X-master-at: 0dbd81251dbc516bb3bf07862c369fc582a4e5e0
5
+X-next-at: 22819c950c7ed8ce0f8755d6134a6eae6064f6d0
6
7
-What's cooking in git.git (Jun 2013, #04; Tue, 11)
7
+What's cooking in git.git (Jun 2013, #05; Sat, 15)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -19,319 +19,265 @@ of the repositories listed at
19
--------------------------------------------------
20
[Graduated to "master"]
21
22
-* ar/wildmatch-foldcase (2013-06-02) 1 commit
23
- (merged to 'next' on 2013-06-04 at 3180bcc)
24
- + wildmatch: properly fold case everywhere
25
-
26
- The wildmatch engine did not honor WM_CASEFOLD option correctly.
27
-
28
-
29
-* cb/log-follow-with-combined (2013-05-28) 1 commit
30
- (merged to 'next' on 2013-06-04 at d5bf4f3)
31
- + fix segfault with git log -c --follow
32
-
33
-
34
-* cm/gitweb-project-list-persistent-cgi-fix (2013-06-07) 1 commit
35
- (merged to 'next' on 2013-06-07 at b16ca1f)
36
- + gitweb: fix problem causing erroneous project list
37
-
38
- "gitweb" forgot to clear a global variable $search_regexp upon each
39
- request, mistakenly carrying over the previous search to a new one
40
- when used as a persistent CGI.
41
-
42
-
43
-* cr/git-work-tree-sans-git-dir (2013-06-03) 1 commit
44
- (merged to 'next' on 2013-06-04 at bebedca)
45
- + git.txt: remove stale comment regarding GIT_WORK_TREE
46
-
47
- These days, "git --work-tree=there cmd" without specifying an
48
- explicit --git-dir=here will do the usual discovery, but we had a
49
- description of older behaviour in the documentation.
50
-
51
-
52
-* fc/at-head (2013-05-08) 13 commits
53
- (merged to 'next' on 2013-06-04 at f334a2a)
54
- + sha1_name: compare variable with constant, not constant with variable
55
- + Add new @ shortcut for HEAD
56
- + sha1_name: refactor reinterpret()
57
- + sha1_name: check @{-N} errors sooner
58
- + sha1_name: reorganize get_sha1_basic()
59
- + sha1_name: don't waste cycles in the @-parsing loop
60
- + sha1_name: remove unnecessary braces
61
- + sha1_name: remove no-op
62
- + tests: at-combinations: @{N} versus HEAD@{N}
63
- + tests: at-combinations: increase coverage
64
- + tests: at-combinations: improve nonsense()
65
- + tests: at-combinations: check ref names directly
66
- + tests: at-combinations: simplify setup
67
-
68
- Instead of typing four capital letters "HEAD", you can say "@".
69
-
70
-
71
-* fc/completion-less-ls-remote (2013-06-02) 1 commit
72
- (merged to 'next' on 2013-06-03 at 6624f0b)
73
- + completion: avoid ls-remote in certain scenarios
74
-
75
-
76
-* fc/do-not-use-the-index-in-add-to-index (2013-06-03) 2 commits
77
- (merged to 'next' on 2013-06-04 at 94e7b60)
78
- + read-cache: trivial style cleanups
79
- + read-cache: fix wrong 'the_index' usage
80
-
81
-
82
-* fc/remote-bzr (2013-05-28) 8 commits
83
- (merged to 'next' on 2013-06-04 at a603082)
84
- + remote-bzr: add fallback check for a partial clone
85
- + remote-bzr: reorganize the way 'wanted' works
86
- + remote-bzr: trivial cleanups
87
- + remote-bzr: change global repo
88
- + remote-bzr: delay cloning/pulling
89
- + remote-bzr: simplify get_remote_branch()
90
- + remote-bzr: fix for files with spaces
91
- + remote-bzr: recover from failed clones
92
-
93
-
94
-* fc/remote-hg (2013-05-28) 50 commits
95
- (merged to 'next' on 2013-06-04 at 9ee7dab)
96
- + remote-hg: add support for --force
97
- + remote-hg: add support for --dry-run
98
- + remote-hg: check if a fetch is needed
99
- + remote-hg: trivial cleanup
100
- + remote-helpers: improve marks usage
101
- + remote-hg: add check_push() helper
102
- + remote-hg: add setup_big_push() helper
103
- + remote-hg: remove files before modifications
104
- + remote-hg: improve lightweight tag author
105
- + remote-hg: use remote 'default' not local one
106
- + remote-hg: improve branch listing
107
- + remote-hg: simplify branch_tip()
108
- + remote-hg: check diverged bookmarks
109
- + remote-hg: pass around revision refs
110
- + remote-hg: implement custom checkheads()
111
- + remote-hg: implement custom push()
112
- + remote-hg: only update necessary revisions
113
- + remote-hg: force remote bookmark push selectively
114
- + remote-hg: reorganize bookmark handling
115
- + remote-hg: add test for failed double push
116
- + remote-hg: add test for big push
117
- + remote-hg: add test for new bookmark special
118
- + remote-hg: add test for bookmark diverge
119
- + remote-hg: add test for diverged push
120
- + remote-hg: add test to push new bookmark
121
- + remote-hg: add remote tests
122
- + remote-hg: update bookmarks when using a remote
123
- + remote-hg: add check_bookmark() test helper
124
- + remote-bzr: simplify test checks
125
- + remote-hg: add tests for 'master' bookmark
126
- + remote-hg: always point HEAD to master
127
- + remote-hg: improve progress calculation
128
- + remote-hg: trivial cleanups
129
- + remote-hg: ensure remote rebasing works
130
- + remote-hg: upgrade version 1 marks
131
- + remote-hg: switch from revisions to SHA-1 noteids
132
- + remote-hg: add version checks to the marks
133
- + remote-hg: improve node traversing
134
- + remote-hg: shuffle some code
135
- + remote-hg: use a shared repository store
136
- + remote-hg: load all extensions
137
- + remote-hg: test: simplify previous branch checkout
138
- + remote-helpers: test: simplify remote URLs
139
- + remote-helpers: tests: general improvements
140
- + remote-helpers: test: cleanup style
141
- + remote-helpers: test: cleanup white-spaces
142
- + remote-hg: trivial reorganization
143
- + remote-hg: test: be a little more quiet
144
- + remote-hg: tests: fix hg merge
145
- + remote-helpers: tests: use python directly
146
-
147
-
148
-* jk/test-exit-code-by-signal (2013-06-06) 2 commits
149
- (merged to 'next' on 2013-06-06 at 6fdea1b)
150
- + t0005: skip signal death exit code test on Windows
151
- (merged to 'next' on 2013-06-03 at 25af892)
152
- + t0005: test git exit code from signal death
153
-
154
-
155
-* mm/mediawiki-https-fail-message (2013-05-29) 1 commit
156
- (merged to 'next' on 2013-06-04 at fb2671c)
157
- + git-remote-mediawiki: better error message when HTTP(S) access fails
158
-
159
- Hint users when https:// connection failed to check the
160
- certificate; it is a good hint if we assumie that it is common
161
- error for the end users to make.
162
-
163
-
164
-* nd/warn-ambiguous-object-name (2013-05-29) 1 commit
165
- (merged to 'next' on 2013-06-04 at e87c9d1)
166
- + get_sha1: warn about full or short object names that look like refs
167
-
168
- "git cmd <name>", when <name> happens to be a 40-hex string,
169
- directly uses the 40-hex string as an object name, even if a ref
170
- "refs/<some hierarchy>/<name>" exists. This disambiguation order
171
- is unlikely to change, but we should warn about the ambiguity just
172
- like we warn when more than one refs/ hierachies share the same
173
- name.
174
-
175
-
176
-* rj/mingw-cygwin (2013-05-08) 2 commits
177
- (merged to 'next' on 2013-06-04 at 308fdb4)
178
- + cygwin: Remove the CYGWIN_V15_WIN32API build variable
179
- + mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
180
-
181
- Update build for Cygwin 1.[57]. Torsten Bögershausen reports that
182
- this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
183
- ahead.
184
-
185
-
186
-* rr/die-on-missing-upstream (2013-06-02) 2 commits
187
- (merged to 'next' on 2013-06-03 at 00847ea)
188
- + sha1_name: fix error message for @{<N>}, @{<date>}
189
- + sha1_name: fix error message for @{u}
190
-
191
- When a reflog notation is used for implicit "current branch", we
192
- did not say which branch and worse said "branch ''".
193
-
194
-
195
-* rr/diffcore-pickaxe-doc (2013-06-03) 2 commits
196
- (merged to 'next' on 2013-06-04 at 67d1fc7)
197
- + diffcore-pickaxe doc: document -S and -G properly
198
- + diffcore-pickaxe: make error messages more consistent
199
-
200
- Update the low-level diffcore documentation on -S/-G and --pickaxe-all.
201
-
202
-
203
-* rr/maint-fetch-tag-doc-asterisks (2013-06-07) 1 commit
204
- (merged to 'next' on 2013-06-07 at bfa4e7b)
205
- + fetch-options.txt: prevent a wildcard refspec from getting misformatted
206
-
207
-
208
-* rr/rebase-autostash (2013-05-29) 7 commits
209
- (merged to 'next' on 2013-06-04 at 16f7c54)
210
- + rebase: implement --[no-]autostash and rebase.autostash
211
- + rebase --merge: return control to caller, for housekeeping
212
- + rebase -i: return control to caller, for housekeeping
213
- + am: return control to caller, for housekeeping
214
- + rebase: prepare to do generic housekeeping
215
- + rebase -i: don't error out if $state_dir already exists
216
- + am: tighten a conditional that checks for $dotest
217
-
218
-
219
-* rs/unpack-trees-plug-leak (2013-06-02) 7 commits
220
- (merged to 'next' on 2013-06-03 at 97e7b6d)
221
- + unpack-trees: free cache_entry array members for merges
222
- + diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
223
- + diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
224
- + unpack-trees: create working copy of merge entry in merged_entry
225
- + unpack-trees: factor out dup_entry
226
- + read-cache: mark cache_entry pointers const
227
- + cache: mark cache_entry pointers const
22
+* bp/mediawiki-credential (2013-06-05) 1 commit
23
+ (merged to 'next' on 2013-06-05 at ea07ec1)
24
+ + git-remote-mediawiki: use Git.pm functions for credentials
25
26
+ The bridge to MediaWiki has been updated to use the credential
27
+ helper interface in Git.pm, losing its own and the original
28
+ implementation the former was based on.
29
230
-* tr/sha1-file-silence-loose-object-info-under-prune-race (2013-06-03) 1 commit
231
- (merged to 'next' on 2013-06-04 at e891bb8)
232
- + sha1_file: silence sha1_loose_object_info
30
31
+* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
32
+ (merged to 'next' on 2013-06-05 at 193242b)
33
+ + revision.c: make default history consider bottom commits
34
+ + revision.c: don't show all merges for --parents
35
+ + revision.c: discount side branches when computing TREESAME
36
+ + revision.c: add BOTTOM flag for commits
37
+ + simplify-merges: drop merge from irrelevant side branch
38
+ + simplify-merges: never remove all TREESAME parents
39
+ + t6012: update test for tweaked full-history traversal
40
+ + revision.c: Make --full-history consider more merges
41
+ + Documentation: avoid "uninteresting"
42
+ + rev-list-options.txt: correct TREESAME for P
43
+ + t6111: add parents to tests
44
+ + t6111: allow checking the parents as well
45
+ + t6111: new TREESAME test set
46
+ + t6019: test file dropped in -s ours merge
47
+ + decorate.c: compact table when growing
48
+
49
+ Major update to a very core part of the revision traversal logic to
50
+ improve culling of irrelevant parents while traversing a mergy
51
+ history.
52
+
53
+
54
+* mh/reflife (2013-06-02) 25 commits
55
+ (merged to 'next' on 2013-06-05 at 291d863)
56
+ + refs: document the lifetime of the args passed to each_ref_fn
57
+ + register_ref(): make a copy of the bad reference SHA-1
58
+ + exclude_existing(): set existing_refs.strdup_strings
59
+ + string_list_add_refs_by_glob(): add a comment about memory management
60
+ + string_list_add_one_ref(): rename first parameter to "refname"
61
+ + show_head_ref(): rename first parameter to "refname"
62
+ + show_head_ref(): do not shadow name of argument
63
+ + add_existing(): do not retain a reference to sha1
64
+ + do_fetch(): clean up existing_refs before exiting
65
+ + do_fetch(): reduce scope of peer_item
66
+ + object_array_entry: fix memory handling of the name field
67
+ + find_first_merges(): remove unnecessary code
68
+ + find_first_merges(): initialize merges variable using initializer
69
+ + fsck: don't put a void*-shaped peg in a char*-shaped hole
70
+ + object_array_remove_duplicates(): rewrite to reduce copying
71
+ + revision: use object_array_filter() in implementation of gc_boundary()
72
+ + object_array: add function object_array_filter()
73
+ + revision: split some overly-long lines
74
+ + cmd_diff(): make it obvious which cases are exclusive of each other
75
+ + cmd_diff(): rename local variable "list" -> "entry"
76
+ + cmd_diff(): use an object_array for holding trees
77
+ + builtin_diff_tree(): make it obvious that function wants two entries
78
+ + add_rev_cmdline(): make a copy of the name argument
79
+ + fetch: make own copies of refnames
80
+ + describe: make own copy of refname
81
+ (this branch is used by mh/ref-races.)
82
+
83
+ Define memory ownership and lifetime rules for what for-each-ref
84
+ feeds to its callbacks (in short, "you do not own it, so make a
85
+ copy if you want to keep it").
86
+
87
+
88
+* mt/send-email-cc-match-fix (2013-06-05) 7 commits
89
+ (merged to 'next' on 2013-06-06 at e4d0831)
90
+ + test-send-email: test for pre-sanitized self name
91
+ + t/send-email: test suppress-cc=self with non-ascii
92
+ + t/send-email: add test with quoted sender
93
+ + send-email: make --suppress-cc=self sanitize input
94
+ + t/send-email: test suppress-cc=self on cccmd
95
+ + send-email: fix suppress-cc=self on cccmd
96
+ + t/send-email.sh: add test for suppress-cc=self
97
+
98
+ Logic git-send-email used to suppress cc mishandled names like "A
99
+ U. Thor" <author@example.xz>, where the human readable part needs
100
+ to be quoted (the user input may not have the double quotes around
101
+ the name, and comparison was done between quoted and unquoted
102
+ strings).
103
+
104
+
105
+* rr/complete-difftool-fixup (2013-06-09) 2 commits
106
+ (merged to 'next' on 2013-06-11 at fe91170)
107
+ + completion: show can take both revlist and paths
108
+ + completion: difftool takes both revs and files
109
+ (this branch is tangled with rr/complete-difftool.)
110
+
111
+ "git difftool" can take both revs to be compared and pathspecs.
112
+ "git show" takes revs, revs:path and pathspecs.
113
235
-* tr/test-commit-only-on-orphan (2013-06-02) 1 commit
236
- (merged to 'next' on 2013-06-03 at b1864fd)
237
- + Test 'commit --only' after 'checkout --orphan'
114
115
+* rr/remove-contrib-some (2013-06-12) 2 commits
116
+ (merged to 'next' on 2013-06-12 at 797644c)
117
+ + contrib: drop blameview/ directory
118
+ (merged to 'next' on 2013-06-05 at fc15705)
119
+ + contrib: remove continuous/ and patches/
120
240
-* xq/credential-osxkeychain (2013-05-28) 1 commit
241
- (merged to 'next' on 2013-06-04 at a4ee0e0)
242
- + credential-osxkeychain: support more protocols
121
+ Remove stale contrib/ material.
122
123
--------------------------------------------------
124
[New Topics]
125
247
-* jc/topo-author-date-sort (2013-06-11) 4 commits
248
- - log: --author-date-order
249
- - sort-in-topological-order: use prio-queue
250
- - prio-queue: priority queue of pointers to structs
251
- - toposort: rename "lifo" field
252
- (this branch uses jk/commit-info-slab; is tangled with jc/show-branch.)
253
-
254
- "git log" learned the "--author-date-order" option, with which the
255
- output is topologically sorted and commits in parallel histories
256
- are shown intermixed together based on the author timestamp.
126
+* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit
127
+ - prompt: squelch error output from cat
128
129
Will merge to 'next'.
130
131
261
-* fc/makefile (2013-06-09) 4 commits
262
- - Makefile: use $^ to avoid listing prerequisites on the command line
263
- - build: do not install git-remote-testgit
264
- - build: generate and clean test scripts
265
- - Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
132
+* jh/libify-note-handling (2013-06-12) 3 commits
133
+ - Move create_notes_commit() from notes-merge.c into notes-utils.c
134
+ - Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
135
+ - finish_copy_notes_for_rewrite(): Let caller provide commit message
136
+
137
+
138
+* jk/add-i-custom-diff-algo (2013-06-12) 1 commit
139
+ - add--interactive: respect diff.algorithm
140
141
Will merge to 'next'.
142
143
270
-* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit
271
- - test: test_must_be_empty helper
144
+* mh/ref-races (2013-06-11) 13 commits
145
+ - refs: do not invalidate the packed-refs cache unnecessarily
146
+ - for_each_ref: load all loose refs before packed refs
147
+ - get_packed_ref_cache: reload packed-refs file when it changes
148
+ - add a stat_validity struct
149
+ - Extract a struct stat_data from cache_entry
150
+ - packed_ref_cache: increment refcount when locked
151
+ - do_for_each_entry(): increment the packed refs cache refcount
152
+ - refs: manage lifetime of packed refs cache via reference counting
153
+ - refs: implement simple transactions for the packed-refs file
154
+ - refs: wrap the packed refs cache in a level of indirection
155
+ - pack_refs(): split creation of packed refs and entry writing
156
+ - repack_without_ref(): split list curation and entry writing
157
+ - Merge branch 'mh/packed-refs-various' into mh/ref-races
158
273
- Will merge to 'next'.
159
160
+* mm/rm-coalesce-errors (2013-06-12) 2 commits
161
+ - rm: introduce advice.rmHints to shorten messages
162
+ - rm: better error message on failure for multiple files
163
276
-* nd/traces (2013-06-09) 2 commits
277
- - git.txt: document GIT_TRACE_PACKET
278
- - core: use env variable instead of config var to turn on logging pack access
164
280
- Will merge to 'next'.
165
+* rr/am-quit-empty-then-abort-fix (2013-06-14) 2 commits
166
+ - SQUASH???
167
+ - am: handle stray $dotest directory
168
169
283
-* rr/complete-difftool-fixup (2013-06-09) 2 commits
284
- (merged to 'next' on 2013-06-11 at fe91170)
285
- + completion: show can take both revlist and paths
286
- + completion: difftool takes both revs and files
287
- (this branch is tangled with rr/complete-difftool.)
170
+* rs/logical-vs-binary-or (2013-06-13) 1 commit
171
+ (merged to 'next' on 2013-06-14 at 2821441)
172
+ + use logical OR (||) instead of binary OR (|) in logical context
173
289
- Replaces rr/complete-difftool.
174
+ Code cleanup.
175
176
Will merge to 'master'.
177
178
294
-* rr/triangle-push-fix (2013-06-09) 4 commits
295
- - t/push-default: test pushdefault with all modes
296
- - t/push-default: generalize test_push_{success, commit}
297
- - push: make upstream, simple work with pushdefault
298
- - t/push-default: remove redundant test_config lines
179
+* rs/match-trees-refactor (2013-06-13) 1 commit
180
+ (merged to 'next' on 2013-06-14 at 1904928)
181
+ + match-trees: factor out fill_tree_desc_strict
182
300
- Tries to apply the 'push.default = upstream' semantics to
301
- triangular workflow where it does not quite apply.
183
+ Code cleanup.
184
303
- Will be worked further.
185
+ Will merge to 'master'.
186
187
306
-* rs/discard-index-discard-array (2013-06-09) 2 commits
307
- - read-cache: free cache in discard_index
308
- - read-cache: add simple performance test
188
+* fg/submodule-non-ascii-path (2013-06-14) 1 commit
189
+ - handle multibyte characters in name
190
+
191
+ Many "git submodule" operations do not work on a submodule at a
192
+ path whose name is not in ASCII.
193
194
Will merge to 'next'.
195
196
313
-* cm/remote-mediawiki (2013-06-11) 1 commit
314
- - git-remote-mediawiki: display message when launched directly
197
+* rr/rebase-autostash (2013-06-13) 3 commits
198
+ - rebase: finish_rebase() in noop rebase
199
+ - rebase: finish_rebase() in fast-forward rebase
200
+ - rebase: guard against missing files in read_basic_state()
201
202
Will merge to 'next'.
203
204
319
-* jg/status-config (2013-06-11) 2 commits
320
- - status:introduce status.branch to enable --branch by default
321
- - status: introduce status.short to enable --short by default
205
+* bp/remote-mw-tests (2013-06-14) 1 commit
206
+ - git-remote-mediawiki: remove hardcoded version number in the test suite
207
208
Will merge to 'next'.
209
210
326
-* mh/loose-refs-race-with-pack-ref (2013-06-11) 4 commits
327
- - resolve_ref_unsafe(): close race condition reading loose refs
328
- - resolve_ref_unsafe(): nest reference-reading code in an infinite loop
329
- - resolve_ref_unsafe(): handle the case of an SHA-1 within loop
330
- - resolve_ref_unsafe(): extract function handle_missing_loose_ref()
211
+* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits
212
+ - git-remote-mediawiki: make error message more precise
213
+ - git-remote-mediawiki: add a perlcritic rule in Makefile
214
+ - git-remote-mediawiki: add a .perlcriticrc file
215
+ - git-remote-mediawiki: clearly rewrite double dereference
216
+ - git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
217
+ - git-remote-mediawiki: put non-trivial numeric values in constants.
218
+ - git-remote-mediawiki: don't use quotes for empty strings
219
+ - git-remote-mediawiki: replace "unless" statements with negated "if" statements
220
+ - git-remote-mediawiki: brace file handles for print for more clarity
221
+ - git-remote-mediawiki: modify strings for a better coding-style
222
+ - git-remote-mediawiki: put long code into a subroutine
223
+ - git-remote-mediawiki: remove import of unused open2
224
+ - git-remote-mediawiki: check return value of open
225
+ - git-remote-mediawiki: assign a variable as undef and make proper indentation
226
+ - git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
227
+ - git-remote-mediawiki: remove unused variable $entry
228
+ - git-remote-mediawiki: turn double-negated expressions into simple expressions
229
+ - git-remote-mediawiki: change the name of a variable
230
+ - git-remote-mediawiki: add newline in the end of die() error messages
231
+ - git-remote-mediawiki: change style in a regexp
232
+ - git-remote-mediawiki: change style in a regexp
233
+ - git-remote-mediawiki: change separator of some regexps
234
+ - git-remote-mediawiki: change the behaviour of a split
235
+ - git-remote-mediawiki: remove useless regexp modifier (m)
236
+ - git-remote-mediawiki: rewrite unclear line of instructions
237
+ - git-remote-mediawiki: change syntax of map calls
238
+ - git-remote-mediawiki: move a variable declaration at the top of the code
239
+ - git-remote-mediawiki: always end a subroutine with a return
240
+ - git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
241
+ - git-remote-mediawiki: move "use warnings;" before any instruction
242
+ - git-remote-mediawiki: make a regexp clearer
243
+
244
+ Will merge to 'next'.
245
+
246
+
247
+* jk/apache-test-for-2.4 (2013-06-14) 4 commits
248
+ - t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
249
+ - t/lib-httpd/apache.conf: load compat access module in apache 2.4
250
+ - t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
251
+ - t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
252
+
253
+ Will merge to 'next'.
254
+
255
+
256
+* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
257
+ - rebase: use peel_committish() where appropriate
258
+ - sh-setup: add new peel_committish() helper
259
+ - t/rebase: add failing tests for a peculiar revision
260
+
261
+
262
+* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
263
+ - unpack_entry: do not die when we fail to apply a delta
264
+ - t5303: drop "count=1" from corruption dd
265
266
--------------------------------------------------
267
[Stalled]
268
269
+* rr/triangle-push-fix (2013-06-09) 4 commits
270
+ - t/push-default: test pushdefault with all modes
271
+ - t/push-default: generalize test_push_{success, commit}
272
+ - push: make upstream, simple work with pushdefault
273
+ - t/push-default: remove redundant test_config lines
274
+
275
+ Tries to apply the 'push.default = upstream' semantics to
276
+ triangular workflow where it does not quite apply.
277
+
278
+ Waiting for a reroll.
279
+
280
+
281
* jh/shorten-refname (2013-05-07) 4 commits
282
- t1514: refname shortening is done after dereferencing symbolic refs
283
- shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
@@ -384,18 +330,6 @@ of the repositories listed at
330
Seems to break some tests in a trivial and obvious way.
331
332
387
-* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits
388
- - remote-helpers: add exec-path links
389
- - remote-helpers: allow direct test execution
390
- - remote-helpers: rename tests
391
- - remote-helpers: generate scripts
392
-
393
- I do not particularly think the second from the bottom is a good
394
- change, but it takes the remainder of the series hostage.
395
-
396
- Waiting for a reroll.
397
-
398
-
333
* jk/packed-refs-race (2013-05-06) 4 commits
334
. for_each_ref: load all loose refs before packed refs
335
. get_packed_refs: reload packed-refs file when it changes
@@ -469,17 +403,87 @@ of the repositories listed at
403
--------------------------------------------------
404
[Cooking]
405
406
+* jc/topo-author-date-sort (2013-06-11) 4 commits
407
+ (merged to 'next' on 2013-06-15 at ad4fb48)
408
+ + log: --author-date-order
409
+ + sort-in-topological-order: use prio-queue
410
+ + prio-queue: priority queue of pointers to structs
411
+ + toposort: rename "lifo" field
412
+ (this branch uses jk/commit-info-slab; is tangled with jc/show-branch.)
413
+
414
+ "git log" learned the "--author-date-order" option, with which the
415
+ output is topologically sorted and commits in parallel histories
416
+ are shown intermixed together based on the author timestamp.
417
+
418
+
419
+* fc/makefile (2013-06-09) 4 commits
420
+ (merged to 'next' on 2013-06-14 at 75b5f6b)
421
+ + Makefile: use $^ to avoid listing prerequisites on the command line
422
+ + build: do not install git-remote-testgit
423
+ + build: generate and clean test scripts
424
+ + Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
425
+
426
+ Makefile simplification.
427
+
428
+ Will merge to 'master'.
429
+
430
+
431
+* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit
432
+ (merged to 'next' on 2013-06-14 at 99b6b54)
433
+ + test: test_must_be_empty helper
434
+
435
+ Will merge to 'master'.
436
+
437
+
438
+* nd/traces (2013-06-09) 2 commits
439
+ (merged to 'next' on 2013-06-14 at ce0d897)
440
+ + git.txt: document GIT_TRACE_PACKET
441
+ + core: use env variable instead of config var to turn on logging pack access
442
+
443
+ Will merge to 'master'.
444
+
445
+
446
+* rs/discard-index-discard-array (2013-06-09) 2 commits
447
+ (merged to 'next' on 2013-06-14 at 778ea9b)
448
+ + read-cache: free cache in discard_index
449
+ + read-cache: add simple performance test
450
+
451
+ Will merge to 'master'.
452
+
453
+
454
+* cm/remote-mediawiki (2013-06-11) 1 commit
455
+ (merged to 'next' on 2013-06-15 at bdce58e)
456
+ + git-remote-mediawiki: display message when launched directly
457
+
458
+ Will merge to 'master'.
459
+
460
+
461
+* jg/status-config (2013-06-15) 2 commits
462
+ (merged to 'next' on 2013-06-15 at 2bc6547)
463
+ + status: introduce status.branch to enable --branch by default
464
+ + status: introduce status.short to enable --short by default
465
+
466
+ Will merge to 'master'.
467
+
468
+
469
+* mh/loose-refs-race-with-pack-ref (2013-06-11) 4 commits
470
+ - resolve_ref_unsafe(): close race condition reading loose refs
471
+ - resolve_ref_unsafe(): nest reference-reading code in an infinite loop
472
+ - resolve_ref_unsafe(): handle the case of an SHA-1 within loop
473
+ - resolve_ref_unsafe(): extract function handle_missing_loose_ref()
474
+
475
+
476
* jk/commit-info-slab (2013-06-07) 3 commits
473
- - commit-slab: introduce a macro to define a slab for new type
474
- - commit-slab: avoid large realloc
475
- - commit: allow associating auxiliary info on-demand
477
+ (merged to 'next' on 2013-06-15 at 908ab93)
478
+ + commit-slab: introduce a macro to define a slab for new type
479
+ + commit-slab: avoid large realloc
480
+ + commit: allow associating auxiliary info on-demand
481
(this branch is used by jc/show-branch and jc/topo-author-date-sort.)
482
478
- Technology demonstration to show a way we could add custom
479
- information to represent unbound number of flag bits etc. to commit
480
- objects.
483
+ Allow adding custom information to commit objects in order to
484
+ represent unbound number of flag bits etc.
485
482
- Will be in 'next' with jc/topo-author-date-sort.
486
+ Will merge to 'master'.
487
488
489
* fc/sequencer-skip-quiet (2013-06-06) 5 commits
@@ -497,94 +501,41 @@ of the repositories listed at
501
502
503
* js/test-ln-s-add (2013-06-07) 10 commits
500
- - t4011: remove SYMLINKS prerequisite
501
- - t6035: use test_ln_s_add to remove SYMLINKS prerequisite
502
- - t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
503
- - t3100: use test_ln_s_add to remove SYMLINKS prerequisite
504
- - t3030: use test_ln_s_add to remove SYMLINKS prerequisite
505
- - t0000: use test_ln_s_add to remove SYMLINKS prerequisite
506
- - tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
507
- - tests: introduce test_ln_s_add
508
- - t3010: modernize style
509
- - test-chmtime: Fix exit code on Windows
504
+ (merged to 'next' on 2013-06-14 at 9f58cb1)
505
+ + t4011: remove SYMLINKS prerequisite
506
+ + t6035: use test_ln_s_add to remove SYMLINKS prerequisite
507
+ + t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
508
+ + t3100: use test_ln_s_add to remove SYMLINKS prerequisite
509
+ + t3030: use test_ln_s_add to remove SYMLINKS prerequisite
510
+ + t0000: use test_ln_s_add to remove SYMLINKS prerequisite
511
+ + tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
512
+ + tests: introduce test_ln_s_add
513
+ + t3010: modernize style
514
+ + test-chmtime: Fix exit code on Windows
515
516
Many tests that check the behaviour of symbolic links stored in the
517
index or the tree objects do not have to be skipped on a filesystem
518
that lack symbolic link support.
519
515
- Will merge to 'next'.
516
-
517
-
518
-* mt/send-email-cc-match-fix (2013-06-05) 7 commits
519
- (merged to 'next' on 2013-06-06 at e4d0831)
520
- + test-send-email: test for pre-sanitized self name
521
- + t/send-email: test suppress-cc=self with non-ascii
522
- + t/send-email: add test with quoted sender
523
- + send-email: make --suppress-cc=self sanitize input
524
- + t/send-email: test suppress-cc=self on cccmd
525
- + send-email: fix suppress-cc=self on cccmd
526
- + t/send-email.sh: add test for suppress-cc=self
527
-
528
- Logic git-send-email used to suppress cc mishandled names like "A
529
- U. Thor" <author@example.xz>, where the human readable part needs
530
- to be quoted (the user input may not have the double quotes around
531
- the name, and comparison was done between quoted and unquoted
532
- strings).
533
-
534
- Will merge to 'master'.
535
-
536
-
537
-* rr/complete-difftool (2013-06-09) 4 commits
538
- (merged to 'next' on 2013-06-09 at 2ee40cb)
539
- + Revert 77c1305 and 3c3b46b
540
- (merged to 'next' on 2013-06-07 at 90e5f58)
541
- + completion: add deprecated __git_complete_file ()
542
- (merged to 'next' on 2013-06-04 at 01c7611)
543
- + completion: clarify ls-tree, archive, show completion
544
- + completion: difftool takes both revs and files
545
- (this branch is tangled with rr/complete-difftool-fixup.)
546
-
547
- Update command line completion (in contrib/) to use a better named
548
- completion helper function for commands that take revisions and
549
- paths.
550
-
551
- Reverted, to be replaced with rr/complete-difftool-fixup.
552
-
553
-
554
-* bp/mediawiki-credential (2013-06-05) 1 commit
555
- (merged to 'next' on 2013-06-05 at ea07ec1)
556
- + git-remote-mediawiki: use Git.pm functions for credentials
557
-
558
- The bridge to MediaWiki has been updated to use the credential
559
- helper interface in Git.pm, losing its own and the original
560
- implementation the former was based on.
561
-
520
Will merge to 'master'.
521
522
523
* mz/rebase-tests (2013-06-07) 7 commits
566
- - tests: move test for rebase messages from t3400 to t3406
567
- - t3406: modernize style
568
- - add tests for rebasing merged history
569
- - add tests for rebasing root
570
- - add tests for rebasing of empty commits
571
- - add tests for rebasing with patch-equivalence present
572
- - add simple tests of consistency across rebase types
524
+ (merged to 'next' on 2013-06-14 at 73f3318)
525
+ + tests: move test for rebase messages from t3400 to t3406
526
+ + t3406: modernize style
527
+ + add tests for rebasing merged history
528
+ + add tests for rebasing root
529
+ + add tests for rebasing of empty commits
530
+ + add tests for rebasing with patch-equivalence present
531
+ + add simple tests of consistency across rebase types
532
574
- Will merge to 'next'.
533
+ Will merge to 'master'.
534
535
536
* nd/make-wildmatch-default (2013-06-02) 1 commit
578
- - Makefile: promote wildmatch to be the default fnmatch implementation
579
-
580
- Will merge to 'next'.
581
-
582
-
583
-* rr/remove-contrib-some (2013-06-02) 1 commit
584
- (merged to 'next' on 2013-06-05 at fc15705)
585
- + contrib: remove continuous/ and patches/
586
-
587
- Remove stale contrib/ material.
537
+ (merged to 'next' on 2013-06-14 at cf21faa)
538
+ + Makefile: promote wildmatch to be the default fnmatch implementation
539
540
Will merge to 'master'.
541
@@ -597,41 +548,6 @@ of the repositories listed at
548
"diff -B" (ignore blank lines) of GNU diff.
549
550
600
-* mh/reflife (2013-06-02) 25 commits
601
- (merged to 'next' on 2013-06-05 at 291d863)
602
- + refs: document the lifetime of the args passed to each_ref_fn
603
- + register_ref(): make a copy of the bad reference SHA-1
604
- + exclude_existing(): set existing_refs.strdup_strings
605
- + string_list_add_refs_by_glob(): add a comment about memory management
606
- + string_list_add_one_ref(): rename first parameter to "refname"
607
- + show_head_ref(): rename first parameter to "refname"
608
- + show_head_ref(): do not shadow name of argument
609
- + add_existing(): do not retain a reference to sha1
610
- + do_fetch(): clean up existing_refs before exiting
611
- + do_fetch(): reduce scope of peer_item
612
- + object_array_entry: fix memory handling of the name field
613
- + find_first_merges(): remove unnecessary code
614
- + find_first_merges(): initialize merges variable using initializer
615
- + fsck: don't put a void*-shaped peg in a char*-shaped hole
616
- + object_array_remove_duplicates(): rewrite to reduce copying
617
- + revision: use object_array_filter() in implementation of gc_boundary()
618
- + object_array: add function object_array_filter()
619
- + revision: split some overly-long lines
620
- + cmd_diff(): make it obvious which cases are exclusive of each other
621
- + cmd_diff(): rename local variable "list" -> "entry"
622
- + cmd_diff(): use an object_array for holding trees
623
- + builtin_diff_tree(): make it obvious that function wants two entries
624
- + add_rev_cmdline(): make a copy of the name argument
625
- + fetch: make own copies of refnames
626
- + describe: make own copy of refname
627
-
628
- Define memory ownership and lifetime rules for what for-each-ref
629
- feeds to its callbacks (in short, "you do not own it, so make a
630
- copy if you want to keep it").
631
-
632
- Will merge to 'master'.
633
-
634
-
551
* jx/clean-interactive (2013-06-03) 15 commits
552
- test: add t7301 for git-clean--interactive
553
- git-clean: add documentation for interactive git-clean
@@ -688,39 +604,15 @@ of the repositories listed at
604
$gmane/223964
605
606
691
-* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
692
- (merged to 'next' on 2013-06-05 at 193242b)
693
- + revision.c: make default history consider bottom commits
694
- + revision.c: don't show all merges for --parents
695
- + revision.c: discount side branches when computing TREESAME
696
- + revision.c: add BOTTOM flag for commits
697
- + simplify-merges: drop merge from irrelevant side branch
698
- + simplify-merges: never remove all TREESAME parents
699
- + t6012: update test for tweaked full-history traversal
700
- + revision.c: Make --full-history consider more merges
701
- + Documentation: avoid "uninteresting"
702
- + rev-list-options.txt: correct TREESAME for P
703
- + t6111: add parents to tests
704
- + t6111: allow checking the parents as well
705
- + t6111: new TREESAME test set
706
- + t6019: test file dropped in -s ours merge
707
- + decorate.c: compact table when growing
708
-
709
- Major update to a very core part of the revision traversal logic to
710
- improve culling of irrelevant parents while traversing a mergy
711
- history.
712
-
713
- Will merge to 'master'.
714
-
715
-
607
* mm/color-auto-default (2013-06-10) 2 commits
717
- - make color.ui default to 'auto'
718
- - config: refactor management of color.ui's default value
608
+ (merged to 'next' on 2013-06-14 at 0647576)
609
+ + make color.ui default to 'auto'
610
+ + config: refactor management of color.ui's default value
611
612
Flip the default for color.ui to 'auto', which is what many
613
tutorials recommend new users to do.
614
723
- Will merge to 'next'.
615
+ Will merge to 'master'.
616
617
618
* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
@@ -748,3 +640,29 @@ of the repositories listed at
640
aka "--no-ignore-removal".
641
642
Will cook in 'next' until Git 2.0.
643
+
644
+--------------------------------------------------
645
+[Discarded]
646
+
647
+* rr/complete-difftool (2013-06-09) 3 commits
648
+ (merged to 'next' on 2013-06-09 at 2ee40cb)
649
+ + Revert 77c1305 and 3c3b46b
650
+ (merged to 'next' on 2013-06-07 at 90e5f58)
651
+ + completion: add deprecated __git_complete_file ()
652
+ (merged to 'next' on 2013-06-04 at 01c7611)
653
+ + completion: clarify ls-tree, archive, show completion
654
+
655
+ Update command line completion (in contrib/) to use a better named
656
+ completion helper function for commands that take revisions and
657
+ paths.
658
+
659
+ Reverted, to be replaced with rr/complete-difftool-fixup.
660
+
661
+
662
+* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits
663
+ - remote-helpers: add exec-path links
664
+ - remote-helpers: allow direct test execution
665
+ - remote-helpers: rename tests
666
+ - remote-helpers: generate scripts
667
+
668
+ Retracted.