What's cooking (2013/06 #08)
Junio C Hamano committed
Jun 25, 2013 at 15:04 UTC
e81ad98c1a500b74a9dd13bfb8117467e3ed25a9
1 file changed
+455
-401
whats-cooking.txt
+455
-401
@@ -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, #07; Thu, 20)
4
-X-master-at: 21ff9151e811059f5576ca906c519ee5bb5b925e
5
-X-next-at: 7507a48fb149c98af104b7faaacd79147fc7907a
3
+Subject: What's cooking in git.git (Jun 2013, #08; Tue, 25)
4
+X-master-at: 9832cb9d4dc969fbfacfd1f8940fcbdec18bb930
5
+X-next-at: 8b6e9d859f911784fc6d53d779196c2bb7a34181
6
7
-What's cooking in git.git (Jun 2013, #07; Thu, 20)
7
+What's cooking in git.git (Jun 2013, #08; Tue, 25)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -19,166 +19,318 @@ of the repositories listed at
19
--------------------------------------------------
20
[Graduated to "master"]
21
22
-* cm/remote-mediawiki (2013-06-11) 1 commit
23
- (merged to 'next' on 2013-06-15 at bdce58e)
24
- + git-remote-mediawiki: display message when launched directly
22
+* bp/remote-mw-tests (2013-06-14) 1 commit
23
+ (merged to 'next' on 2013-06-17 at 2891373)
24
+ + git-remote-mediawiki: remove hardcoded version number in the test suite
25
+
26
+ Code cleanup.
27
28
27
-* fc/makefile (2013-06-09) 4 commits
28
- (merged to 'next' on 2013-06-14 at 75b5f6b)
29
- + Makefile: use $^ to avoid listing prerequisites on the command line
30
- + build: do not install git-remote-testgit
31
- + build: generate and clean test scripts
32
- + Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
29
+* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits
30
+ (merged to 'next' on 2013-06-17 at a41a924)
31
+ + git-remote-mediawiki: make error message more precise
32
+ + git-remote-mediawiki: add a perlcritic rule in Makefile
33
+ + git-remote-mediawiki: add a .perlcriticrc file
34
+ + git-remote-mediawiki: clearly rewrite double dereference
35
+ + git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
36
+ + git-remote-mediawiki: put non-trivial numeric values in constants.
37
+ + git-remote-mediawiki: don't use quotes for empty strings
38
+ + git-remote-mediawiki: replace "unless" statements with negated "if" statements
39
+ + git-remote-mediawiki: brace file handles for print for more clarity
40
+ + git-remote-mediawiki: modify strings for a better coding-style
41
+ + git-remote-mediawiki: put long code into a subroutine
42
+ + git-remote-mediawiki: remove import of unused open2
43
+ + git-remote-mediawiki: check return value of open
44
+ + git-remote-mediawiki: assign a variable as undef and make proper indentation
45
+ + git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
46
+ + git-remote-mediawiki: remove unused variable $entry
47
+ + git-remote-mediawiki: turn double-negated expressions into simple expressions
48
+ + git-remote-mediawiki: change the name of a variable
49
+ + git-remote-mediawiki: add newline in the end of die() error messages
50
+ + git-remote-mediawiki: change style in a regexp
51
+ + git-remote-mediawiki: change style in a regexp
52
+ + git-remote-mediawiki: change separator of some regexps
53
+ + git-remote-mediawiki: change the behaviour of a split
54
+ + git-remote-mediawiki: remove useless regexp modifier (m)
55
+ + git-remote-mediawiki: rewrite unclear line of instructions
56
+ + git-remote-mediawiki: change syntax of map calls
57
+ + git-remote-mediawiki: move a variable declaration at the top of the code
58
+ + git-remote-mediawiki: always end a subroutine with a return
59
+ + git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
60
+ + git-remote-mediawiki: move "use warnings;" before any instruction
61
+ + git-remote-mediawiki: make a regexp clearer
62
34
- Makefile simplification.
63
+ Code cleanup.
64
65
37
-* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit
38
- (merged to 'next' on 2013-06-14 at 99b6b54)
39
- + test: test_must_be_empty helper
66
+* dk/maint-t5150-dirname (2013-06-17) 1 commit
67
+ (merged to 'next' on 2013-06-20 at 7441301)
68
+ + tests: allow sha1's as part of the path
69
70
+ Fix a test script.
71
42
-* js/test-ln-s-add (2013-06-07) 10 commits
43
- (merged to 'next' on 2013-06-14 at 9f58cb1)
44
- + t4011: remove SYMLINKS prerequisite
45
- + t6035: use test_ln_s_add to remove SYMLINKS prerequisite
46
- + t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
47
- + t3100: use test_ln_s_add to remove SYMLINKS prerequisite
48
- + t3030: use test_ln_s_add to remove SYMLINKS prerequisite
49
- + t0000: use test_ln_s_add to remove SYMLINKS prerequisite
50
- + tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
51
- + tests: introduce test_ln_s_add
52
- + t3010: modernize style
53
- + test-chmtime: Fix exit code on Windows
72
55
- Many tests that check the behaviour of symbolic links stored in the
56
- index or the tree objects do not have to be skipped on a filesystem
57
- that lack symbolic link support.
73
+* dk/version-gen-gitdir (2013-06-17) 1 commit
74
+ (merged to 'next' on 2013-06-20 at c9c687e)
75
+ + GIT-VERSION-GEN: support non-standard $GIT_DIR path
76
77
+ Allow packaging a tarball in a working tree with $GIT_DIR set elsewhere.
78
60
-* mm/color-auto-default (2013-06-10) 2 commits
61
- (merged to 'next' on 2013-06-14 at 0647576)
62
- + make color.ui default to 'auto'
63
- + config: refactor management of color.ui's default value
79
65
- Flip the default for color.ui to 'auto', which is what many
66
- tutorials recommend new users to do.
80
+* fc/sequencer-plug-leak (2013-06-06) 2 commits
81
+ (merged to 'next' on 2013-06-20 at 3c94075)
82
+ + sequencer: avoid leaking message buffer when refusing to create an empty commit
83
+ + sequencer: remove useless indentation
84
85
+ Plug a small leak in an error codepath.
86
69
-* nd/make-wildmatch-default (2013-06-02) 1 commit
70
- (merged to 'next' on 2013-06-14 at cf21faa)
71
- + Makefile: promote wildmatch to be the default fnmatch implementation
87
73
- Uses of the platform fnmatch(3) function (many places in the code,
74
- matching pathspec, .gitignore and .gitattributes to name a few)
75
- have been replaced with wildmatch, allowing "foo/**/bar" that would
76
- match foo/bar, foo/a/bar, foo/a/b/bar, etc.
88
+* fg/submodule-fixup (2013-06-17) 1 commit
89
+ (merged to 'next' on 2013-06-20 at 64d74b4)
90
+ + git-submodule.sh: remove duplicate call to set_rev_name
91
92
+ Code cleanup.
93
79
-* nd/traces (2013-06-09) 2 commits
80
- (merged to 'next' on 2013-06-14 at ce0d897)
81
- + git.txt: document GIT_TRACE_PACKET
82
- + core: use env variable instead of config var to turn on logging pack access
94
95
+* jh/libify-note-handling (2013-06-12) 3 commits
96
+ (merged to 'next' on 2013-06-20 at 7dac8b6)
97
+ + Move create_notes_commit() from notes-merge.c into notes-utils.c
98
+ + Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
99
+ + finish_copy_notes_for_rewrite(): Let caller provide commit message
100
85
-* rs/discard-index-discard-array (2013-06-09) 2 commits
86
- (merged to 'next' on 2013-06-14 at 778ea9b)
87
- + read-cache: free cache in discard_index
88
- + read-cache: add simple performance test
101
+ Make it possible to call into copy-notes API from the sequencer code.
102
90
- Call to discard_cache/discard_index (used when we use different
91
- contents of the index in-core, in many operations like commit,
92
- apply, and merge) used to leak memory that held the array of index
93
- entries, which has been plugged.
103
104
+* jk/apache-test-for-2.4 (2013-06-14) 4 commits
105
+ (merged to 'next' on 2013-06-17 at 290e72e)
106
+ + t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
107
+ + t/lib-httpd/apache.conf: load compat access module in apache 2.4
108
+ + t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
109
+ + t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
110
96
-* rs/logical-vs-binary-or (2013-06-13) 1 commit
97
- (merged to 'next' on 2013-06-14 at 2821441)
98
- + use logical OR (||) instead of binary OR (|) in logical context
111
+ Allow httpd tests to run with Apache 2.4.
112
100
- Code cleanup.
113
114
+* jk/doc-build-move-infordir-def (2013-06-17) 2 commits
115
+ (merged to 'next' on 2013-06-20 at 81e56a8)
116
+ + Documentation/Makefile: move infodir to be with other '*dir's
117
+ + Documentation/Makefile: fix spaces around assignments
118
103
-* rs/match-trees-refactor (2013-06-13) 1 commit
104
- (merged to 'next' on 2013-06-14 at 1904928)
105
- + match-trees: factor out fill_tree_desc_strict
119
+ Makefile cleanup.
120
+
121
+
122
+* jk/mergetool-lib-refactor (2013-06-17) 1 commit
123
+ (merged to 'next' on 2013-06-20 at 7ce98c0)
124
+ + mergetool--lib: refactor {diff,merge}_cmd logic
125
126
Code cleanup.
127
109
---------------------------------------------------
110
-[New Topics]
128
112
-* as/log-output-encoding-in-user-format (2013-06-20) 3 commits
113
- - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
114
- - t7102 (reset): don't hardcode SHA-1 in expected outputs
115
- - t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
129
+* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
130
+ (merged to 'next' on 2013-06-17 at 89e0eab)
131
+ + unpack_entry: do not die when we fail to apply a delta
132
+ + t5303: drop "count=1" from corruption dd
133
117
- "log --format=" did not honor i18n.logoutputencoding configuration
118
- and this is a beginning of the series that attempts to fix it.
134
+ Follow-up to an earlier fix.
135
120
- Waiting for a reroll.
136
137
+* mm/rm-coalesce-errors (2013-06-12) 2 commits
138
+ (merged to 'next' on 2013-06-20 at c70340c)
139
+ + rm: introduce advice.rmHints to shorten messages
140
+ + rm: better error message on failure for multiple files
141
123
-* bc/http-keep-memory-given-to-curl (2013-06-19) 1 commit
124
- - http.c: don't rewrite the user:passwd string multiple times
142
+ Give a single message followed by list of paths from "git rm" to
143
+ report multiple paths that cannot be removed.
144
126
- Older cURL wanted piece of memory we call it with to be stable, but
127
- we updated the auth material after handing it to a call.
145
129
- Will merge to 'next'.
146
+* mz/rebase-tests (2013-06-18) 8 commits
147
+ (merged to 'next' on 2013-06-18 at 12cfec8)
148
+ + rebase topology tests: fix commit names on case-insensitive file systems
149
+ (merged to 'next' on 2013-06-14 at 73f3318)
150
+ + tests: move test for rebase messages from t3400 to t3406
151
+ + t3406: modernize style
152
+ + add tests for rebasing merged history
153
+ + add tests for rebasing root
154
+ + add tests for rebasing of empty commits
155
+ + add tests for rebasing with patch-equivalence present
156
+ + add simple tests of consistency across rebase types
157
158
132
-* jc/reflog-doc (2013-06-19) 1 commit
133
- - setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
159
+* nk/config-local-doc (2013-06-17) 1 commit
160
+ (merged to 'next' on 2013-06-20 at 3568ebe)
161
+ + config: Add description of --local option
162
135
- Document rules to use GIT_REFLOG_ACTION variable in the scripted
136
- Porcelain. git-rebase--interactive locally violates this, but it
137
- is a leaf user that does not call out to or dot-sources other
138
- scripts, so fixing it is not all that urgent.
163
164
+* rr/am-quit-empty-then-abort-fix (2013-06-17) 2 commits
165
+ (merged to 'next' on 2013-06-20 at f9feae3)
166
+ + t/am: use test_path_is_missing() where appropriate
167
+ + am: handle stray $dotest directory
168
141
-* jk/pull-into-dirty-unborn (2013-06-20) 2 commits
142
- - pull: merge into unborn by fast-forwarding from empty tree
143
- - pull: update unborn branch tip after index
169
+ Recent "rebase --autostash" update made it impossible to recover
170
+ with "git am --abort" from a repository where "git am" without mbox
171
+ was run by mistake and then was killed with "^C".
172
145
- "git pull" into nothing trashed "local changes" that were in the
146
- index, and this avoids it.
173
148
- Will merge to 'next'.
174
+* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit
175
+ (merged to 'next' on 2013-06-17 at 02957d8)
176
+ + prompt: squelch error output from cat
177
178
151
-* mh/ref-races-optim-invalidate-cached (2013-06-20) 1 commit
152
- - refs: do not invalidate the packed-refs cache unnecessarily
153
- (this branch uses mh/ref-races.)
179
+* rr/rebase-autostash (2013-06-13) 3 commits
180
+ (merged to 'next' on 2013-06-17 at e692317)
181
+ + rebase: finish_rebase() in noop rebase
182
+ + rebase: finish_rebase() in fast-forward rebase
183
+ + rebase: guard against missing files in read_basic_state()
184
155
- Optional.
185
186
+* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
187
+ (merged to 'next' on 2013-06-20 at d0742fe)
188
+ + rebase: use peel_committish() where appropriate
189
+ + sh-setup: add new peel_committish() helper
190
+ + t/rebase: add failing tests for a peculiar revision
191
158
-* rr/cherry-pick-fast-forward-reflog-message (2013-06-19) 1 commit
159
- - sequencer: write useful reflog message for fast-forward
192
+ Allow various commit objects to be given to "git rebase" by ':/look
193
+ for this string' syntax, e.g. "git rebase --onto ':/there'".
194
161
- The reflog message created when "git cherry-pick" fast-forwarded
162
- did not say anything but "cherry-pick", but it now says
163
- "cherry-pick: fast-forward".
195
165
- Will merge to 'next'.
196
+* rs/unpack-trees-tree-walk-conflict-field (2013-06-17) 1 commit
197
+ (merged to 'next' on 2013-06-20 at 0afbf0b)
198
+ + unpack-trees: don't shift conflicts left and right
199
200
+ Code clean-up.
201
168
-* vl/typofix (2013-06-19) 1 commit
169
- - random typofixes (committed missing a 't', successful missing an 's')
202
+
203
+* rt/cherry-pick-continue-advice-in-status (2013-06-17) 1 commit
204
+ (merged to 'next' on 2013-06-20 at ec8a930)
205
+ + wt-status: give better advice when cherry-pick is in progress
206
+
207
+--------------------------------------------------
208
+[New Topics]
209
+
210
+* rr/remote-branch-config-refresh (2013-06-23) 9 commits
211
+ - t/t5505-remote: test multiple push/pull in remotes-file
212
+ - ls-remote doc: don't encourage use of branches-file
213
+ - ls-remote doc: rewrite <repository> paragraph
214
+ - ls-remote doc: fix example invocation on git.git
215
+ - t/t5505-remote: test url-with-# in branches-file
216
+ - remote: remove dead code in read_branches_file()
217
+ - t/t5505-remote: use test_path_is_missing
218
+ - t/t5505-remote: test push-refspec in branches-file
219
+ - t/t5505-remote: modernize style
220
+
221
+ The original way to specify remote repository using .git/branches/
222
+ used to have a nifty feature. The code to support the feature was
223
+ still in a function but the caller was changed not to call it 5
224
+ years ago, breaking that feature and leaving the supporting code
225
+ unreachable.
226
227
Will merge to 'next'.
228
229
174
-* wk/doc-git-has-grown (2013-06-19) 1 commit
175
- - user-manual: Update download size for Git and the kernel
230
+* tr/maint-apply-non-git-patch-parsefix (2013-06-21) 1 commit
231
+ (merged to 'next' on 2013-06-24 at 50583a5)
232
+ + apply: carefully strdup a possibly-NULL name
233
+
234
+ Fix for the codepath to parse patches that add new files, generated
235
+ by programs other than Git. THis is an old breakage in v1.7.11 and
236
+ will need to be merged down to the maintanance tracks.
237
+
238
+ Will merge to 'master'.
239
+
240
+
241
+* wk/doc-in-linux-3.x-era (2013-06-22) 4 commits
242
+ - Documentation: Update 'linux-2.6.git' -> 'linux.git'
243
+ - Documentation: Update the NFS remote examples to use the staging repo
244
+ - doc/clone: Pick more compelling paths for the --reference example
245
+ - doc/clone: Remove the '--bare -l -s' example
246
+
247
+ Update documentation to update to more recent realities.
248
249
Will merge to 'next'.
250
251
+
252
+* ys/cygstart (2013-06-21) 1 commit
253
+ (merged to 'next' on 2013-06-24 at 822d9ca)
254
+ + web--browse: support /usr/bin/cygstart on Cygwin
255
+
256
+ On "Cygwin", recognize "cygstart" as a possible way to start a web
257
+ browser (used in "help -w" and "instaweb" among others).
258
+
259
+ Will merge to 'master'.
260
+
261
+
262
+* jc/maint-diff-core-safecrlf (2013-06-25) 1 commit
263
+ - diff: demote core.safecrlf=true to core.safecrlf=warn
264
+
265
+ "git diff" refused to even show difference when core.safecrlf is
266
+ set to true (i.e. error out) and there are offending lines in the
267
+ working tree files.
268
+
269
+ Will hold for a while to see if anybody can come up with better
270
+ tests.
271
+
272
+
273
+* jk/fast-import-empty-ls (2013-06-23) 4 commits
274
+ - fast-import: allow moving the root tree
275
+ - fast-import: allow ls or filecopy of the root tree
276
+ - fast-import: set valid mode on root tree in "ls"
277
+ - t9300: document fast-import empty path issues
278
+
279
+ Waiting for reviews.
280
+
281
+
282
+* sg/bash-prompt (2013-06-24) 22 commits
283
+ - Merge branch 'bash-prompt-color-refactorization' into bash-prompt-speedup-and-color-refactorization
284
+ - fixup! git-prompt.sh: add missing information in comments
285
+ - git-prompt.sh: add missing information in comments
286
+ - git-prompt.sh: do not print duplicate clean color code
287
+ - git-prompt.sh: refactor colored prompt code
288
+ - t9903: add tests for git-prompt pcmode
289
+ - bash prompt: mention that PROMPT_COMMAND mode is faster
290
+ - bash prompt: avoid command substitution when finalizing gitstring
291
+ - bash prompt: avoid command substitution when checking for untracked files
292
+ - bash prompt: use bash builtins to check stash state
293
+ - bash prompt: use bash builtins to check for unborn branch for dirty state
294
+ - bash prompt: combine 'git rev-parse' for detached head
295
+ - bash prompt: combine 'git rev-parse' executions in the main code path
296
+ - bash prompt: use bash builtins to find out current branch
297
+ - bash prompt: use bash builtins to find out rebase state
298
+ - bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()
299
+ - bash prompt: return early from __git_ps1() when not in a git repository
300
+ - bash prompt: print unique detached HEAD abbreviated object name
301
+ - bash prompt: add a test for symbolic link symbolic refs
302
+ - completion, bash prompt: move __gitdir() tests to completion test suite
303
+ - bash prompt: use 'write_script' helper in interactive rebase test
304
+ - bash prompt: fix redirection coding style in tests
305
+
306
+ Will hold for a few days, then split and merge to 'next'.
307
+
308
+
309
+* af/rebase-i-merge-options (2013-06-25) 2 commits
310
+ - SQUASH???
311
+ - Do not ignore merge options in interactive rebase
312
+
313
+ "git rebase -i" now honors --strategy and -X options.
314
+
315
+
316
+* rj/cygwin-remove-cheating-lstat (2013-06-25) 1 commit
317
+ - cygwin: Remove the Win32 l/stat() implementation
318
+
319
--------------------------------------------------
320
[Stalled]
321
322
+* as/log-output-encoding-in-user-format (2013-06-20) 3 commits
323
+ - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
324
+ - t7102 (reset): don't hardcode SHA-1 in expected outputs
325
+ - t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
326
+
327
+ "log --format=" did not honor i18n.logoutputencoding configuration
328
+ and this is a beginning of the series that attempts to fix it.
329
+
330
+ Waiting for a reroll, not to add dependency on new 8859-5 locale.
331
+ $gmane/228532
332
+
333
+
334
* fc/contrib-related (2013-06-09) 5 commits
335
- contrib: related: print the amount of involvement
336
- contrib: related: parse committish like format-patch
@@ -200,44 +352,6 @@ of the repositories listed at
352
$gmane/223964
353
354
203
-* rr/triangle-push-fix (2013-06-20) 9 commits
204
- - push: honor branch.*.push
205
- - SQUASH??? fix git-config push.default description
206
- - SQUASH??? minimum "simple" safety fix-up
207
- - t/t5528-push-default: test pushdefault workflows
208
- - t/t5528-push-default: generalize test_push_*
209
- - push: remove dead code in setup_push_upstream()
210
- - push: change `simple` to accommodate triangular workflows
211
- - config doc: rewrite push.default section
212
- - t/t5528-push-default: remove redundant test_config lines
213
-
214
- Earlier remote.pushdefault (and per-branch branch.*.pushremote)
215
- were introduced as an additional mechanism to choose what
216
- repository to push into when "git push" did not say it from the
217
- command line, to help people who push to a repository that is
218
- different from where they fetch from. This attempts to finish that
219
- topic by teaching the default mechanism to choose branch in the
220
- remote repository to be updated by such a push.
221
-
222
- The 'current', 'matching' and 'nothing' modes (specified by the
223
- push.default configuration variable) extend to such a "triangular"
224
- workflow naturally, but 'upstream' and 'simple' have to be updated.
225
-
226
- . 'upstream' is about pushing back to update the branch in the
227
- remote repository that the current branch fetches from and
228
- integrates with, it errors out in a triangular workflow.
229
-
230
- . 'simple' is meant to help new people by avoiding mistakes, and
231
- will be the safe default in Git 2.0. In a non-triangular
232
- workflow, it will continue to act as a cross between 'upstream'
233
- and 'current' in that it pushes to the current branch's
234
- @{upstream} only when it is set to the same name as the current
235
- branch (e.g. your 'master' forks from the 'master' from the
236
- central repository). In a triangular workflow, this series
237
- tentatively defines it as the same as 'current', but we may have
238
- to tighten it to avoid surprises in some way.
239
-
240
-
355
* jh/shorten-refname (2013-05-07) 4 commits
356
- t1514: refname shortening is done after dereferencing symbolic refs
357
- shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
@@ -345,88 +459,148 @@ of the repositories listed at
459
--------------------------------------------------
460
[Cooking]
461
348
-* rr/rebase-checkout-reflog (2013-06-17) 8 commits
349
- - SQUASH???
350
- - rebase -i: use a better reflog message
351
- - rebase: use a better reflog message
352
- - checkout: respect GIT_REFLOG_ACTION
353
- - status: do not depend on rebase reflog messages
354
- - t/t2021-checkout-last: "checkout -" should work after a rebase finishes
355
- - wt-status: remove unused field in grab_1st_switch_cbdata
356
- - t7512: test "detached from" as well
462
+* jc/triangle-push-fixup (2013-06-24) 5 commits
463
+ - t/t5528-push-default: test pushdefault workflows
464
+ - t/t5528-push-default: generalize test_push_*
465
+ - push: change `simple` to accommodate triangular workflows
466
+ - config doc: rewrite push.default section
467
+ - t/t5528-push-default: remove redundant test_config lines
468
+ (this branch is tangled with rr/triangle-push-fix.)
469
358
- Invocations of "git checkout" used internally by "git rebase" were
359
- counted as "checkout", and affected later "git checkout -" to the
360
- the user to an unexpected place.
470
+ Earlier remote.pushdefault (and per-branch branch.*.pushremote)
471
+ were introduced as an additional mechanism to choose what
472
+ repository to push into when "git push" did not say it from the
473
+ command line, to help people who push to a repository that is
474
+ different from where they fetch from. This attempts to finish that
475
+ topic by teaching the default mechanism to choose branch in the
476
+ remote repository to be updated by such a push.
477
362
- Waiting for a reroll.
363
- $gmane/228271.
478
+ The 'current', 'matching' and 'nothing' modes (specified by the
479
+ push.default configuration variable) extend to such a "triangular"
480
+ workflow naturally, but 'upstream' and 'simple' have to be updated.
481
+
482
+ . 'upstream' is about pushing back to update the branch in the
483
+ remote repository that the current branch fetches from and
484
+ integrates with, it errors out in a triangular workflow.
485
+
486
+ . 'simple' is meant to help new people by avoiding mistakes, and
487
+ will be the safe default in Git 2.0. In a non-triangular
488
+ workflow, it will continue to act as a cross between 'upstream'
489
+ and 'current' in that it pushes to the current branch's
490
+ @{upstream} only when it is set to the same name as the current
491
+ branch (e.g. your 'master' forks from the 'master' from the
492
+ central repository). In a triangular workflow, this series
493
+ tentatively defines it as the same as 'current', but we may have
494
+ to tighten it to avoid surprises in some way.
495
+
496
+ Will merge to 'next'.
497
+
498
+
499
+* jg/status-config (2013-06-24) 4 commits
500
+ - status/commit: make sure --porcelain is not affected by user-facing config
501
+ - commit: make it work with status.short
502
+ - status: introduce status.branch to enable --branch by default
503
+ - status: introduce status.short to enable --short by default
504
+
505
+ "git status" learned status.branch and status.short configuration
506
+ variables to use --branch and --short options by default (override
507
+ with --no-branch and --no-short options from the command line).
508
+
509
+ The bottom two has been graduated to 'master' but then reverted.
510
+ The tip two are quick attempts to fix the fallout. The one for
511
+ status.short looks correct; the other one is still in flux and
512
+ under discussion, waiting for alternative cleaner patches.
513
+
514
+
515
+* bc/http-keep-memory-given-to-curl (2013-06-19) 1 commit
516
+ (merged to 'next' on 2013-06-23 at cf91828)
517
+ + http.c: don't rewrite the user:passwd string multiple times
518
+
519
+ Older cURL wanted piece of memory we call it with to be stable, but
520
+ we updated the auth material after handing it to a call.
521
522
+ Will merge to 'master'.
523
366
-* rr/rebase-stash-store (2013-06-17) 5 commits
367
- - rebase: use 'git stash store' to simplify logic
368
- - stash: introduce 'git stash store'
369
- - stash: simplify option parser for create
370
- - stash doc: document short form -p in synopsis
371
- - stash doc: add a warning about using create
524
373
- Finishing touches for the "git rebase --autostash" feature
374
- introduced earlier.
525
+* jc/reflog-doc (2013-06-19) 1 commit
526
+ - setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
527
376
- Will merge to 'next'.
528
+ Document rules to use GIT_REFLOG_ACTION variable in the scripted
529
+ Porcelain. git-rebase--interactive locally violates this, but it
530
+ is a leaf user that does not call out to or dot-sources other
531
+ scripts, so fixing it is not all that urgent.
532
533
379
-* rs/unpack-trees-tree-walk-conflict-field (2013-06-17) 1 commit
380
- (merged to 'next' on 2013-06-20 at 0afbf0b)
381
- + unpack-trees: don't shift conflicts left and right
534
+* jk/pull-into-dirty-unborn (2013-06-20) 2 commits
535
+ (merged to 'next' on 2013-06-23 at ab4b111)
536
+ + pull: merge into unborn by fast-forwarding from empty tree
537
+ + pull: update unborn branch tip after index
538
383
- Code clean-up.
539
+ "git pull" into nothing trashed "local changes" that were in the
540
+ index, and this avoids it.
541
542
Will merge to 'master'.
543
544
388
-* dk/maint-t5150-dirname (2013-06-17) 1 commit
389
- (merged to 'next' on 2013-06-20 at 7441301)
390
- + tests: allow sha1's as part of the path
391
-
392
- Fix a test script.
545
+* mh/ref-races-optim-invalidate-cached (2013-06-20) 1 commit
546
+ - refs: do not invalidate the packed-refs cache unnecessarily
547
+ (this branch uses mh/ref-races.)
548
394
- Will merge to 'master'.
549
+ Optional.
550
551
397
-* dk/version-gen-gitdir (2013-06-17) 1 commit
398
- (merged to 'next' on 2013-06-20 at c9c687e)
399
- + GIT-VERSION-GEN: support non-standard $GIT_DIR path
552
+* rr/cherry-pick-fast-forward-reflog-message (2013-06-19) 1 commit
553
+ (merged to 'next' on 2013-06-24 at 8b6e9d8)
554
+ + sequencer: write useful reflog message for fast-forward
555
401
- Allow packaging a tarball in a working tree with $GIT_DIR set elsewhere.
556
+ The reflog message created when "git cherry-pick" fast-forwarded
557
+ did not say anything but "cherry-pick", but it now says
558
+ "cherry-pick: fast-forward".
559
560
Will merge to 'master'.
561
562
406
-* fg/submodule-fixup (2013-06-17) 1 commit
407
- (merged to 'next' on 2013-06-20 at 64d74b4)
408
- + git-submodule.sh: remove duplicate call to set_rev_name
563
+* vl/typofix (2013-06-19) 1 commit
564
+ (merged to 'next' on 2013-06-23 at a057524)
565
+ + random typofixes (committed missing a 't', successful missing an 's')
566
+
567
+ Will merge to 'master'.
568
410
- Code cleanup.
569
+
570
+* wk/doc-git-has-grown (2013-06-23) 1 commit
571
+ (merged to 'next' on 2013-06-23 at 256263d)
572
+ + user-manual: Update download size for Git and the kernel
573
574
Will merge to 'master'.
575
576
415
-* jk/doc-build-move-infordir-def (2013-06-17) 2 commits
416
- (merged to 'next' on 2013-06-20 at 81e56a8)
417
- + Documentation/Makefile: move infodir to be with other '*dir's
418
- + Documentation/Makefile: fix spaces around assignments
577
+* rr/rebase-checkout-reflog (2013-06-23) 7 commits
578
+ - rebase -i: use a better reflog message
579
+ - rebase: use a better reflog message
580
+ - checkout: respect GIT_REFLOG_ACTION
581
+ - status: do not depend on rebase reflog messages
582
+ - t/t2021-checkout-last: "checkout -" should work after a rebase finishes
583
+ - wt-status: remove unused field in grab_1st_switch_cbdata
584
+ - t7512: test "detached from" as well
585
420
- Makefile cleanup.
586
+ Invocations of "git checkout" used internally by "git rebase" were
587
+ counted as "checkout", and affected later "git checkout -" to the
588
+ the user to an unexpected place.
589
422
- Will merge to 'master'.
590
+ The first four are uncontroversial and ready to be merged.
591
+ Will split and merge to 'next'.
592
593
425
-* jk/mergetool-lib-refactor (2013-06-17) 1 commit
426
- (merged to 'next' on 2013-06-20 at 7ce98c0)
427
- + mergetool--lib: refactor {diff,merge}_cmd logic
594
+* rr/rebase-stash-store (2013-06-17) 5 commits
595
+ (merged to 'next' on 2013-06-23 at 2398dad)
596
+ + rebase: use 'git stash store' to simplify logic
597
+ + stash: introduce 'git stash store'
598
+ + stash: simplify option parser for create
599
+ + stash doc: document short form -p in synopsis
600
+ + stash doc: add a warning about using create
601
429
- Code cleanup.
602
+ Finishing touches for the "git rebase --autostash" feature
603
+ introduced earlier.
604
605
Will merge to 'master'.
606
@@ -438,13 +612,6 @@ of the repositories listed at
612
Will merge to 'master'.
613
614
441
-* nk/config-local-doc (2013-06-17) 1 commit
442
- (merged to 'next' on 2013-06-20 at 3568ebe)
443
- + config: Add description of --local option
444
-
445
- Will merge to 'master'.
446
-
447
-
615
* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
616
- ### DONTMERGE: needs better explanation on what config they need
617
- pack-refs.c: Add missing call to git_config()
@@ -457,18 +624,14 @@ of the repositories listed at
624
$gmane/228294
625
626
460
-* rt/cherry-pick-continue-advice-in-status (2013-06-17) 1 commit
461
- (merged to 'next' on 2013-06-20 at ec8a930)
462
- + wt-status: give better advice when cherry-pick is in progress
463
-
464
- Will merge to 'master'.
465
-
466
-
627
* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
468
- - t/t9802: explicitly name the upstream branch to use as a base
469
- - builtin/checkout.c: don't leak memory in check_tracking_name
628
+ (merged to 'next' on 2013-06-23 at 35f8f85)
629
+ + t/t9802: explicitly name the upstream branch to use as a base
630
+ + builtin/checkout.c: don't leak memory in check_tracking_name
631
471
- Will merge to 'next'.
632
+ Plug a small leak in checkout.
633
+
634
+ Will merge to 'master'.
635
636
637
* kb/diff-blob-blob-doc (2013-06-18) 1 commit
@@ -486,16 +649,25 @@ of the repositories listed at
649
650
651
* mt/send-email-cc-match-fix (2013-06-20) 2 commits
489
- - send-email: sanitize author when writing From line
490
- - send-email: add test for duplicate utf8 name
652
+ (merged to 'next' on 2013-06-23 at a2656b3)
653
+ + send-email: sanitize author when writing From line
654
+ + send-email: add test for duplicate utf8 name
655
492
- Will merge to 'next'.
656
+ Logic used by git-send-email to suppress cc mishandled names that
657
+ need RFC2047 quoting.
658
+
659
+ Will merge to 'master'.
660
661
662
* nk/name-rev-abbreviated-refs (2013-06-18) 1 commit
496
- - name-rev: allow to specify a subpath for --refs option
663
+ (merged to 'next' on 2013-06-23 at 2ec9e05)
664
+ + name-rev: allow to specify a subpath for --refs option
665
498
- Will merge to 'next'.
666
+ "git name-rev --refs=tags/v*" were forbidden, which was a bit
667
+ inconvenient (you had to give a pattern to match refs fully, like
668
+ --refs=refs/tags/v*).
669
+
670
+ Will merge to 'master'.
671
672
673
* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
@@ -506,38 +678,23 @@ of the repositories listed at
678
679
680
* jk/submodule-subdirectory-ok (2013-06-17) 6 commits
509
- - submodule: drop the top-level requirement
510
- - rev-parse: add --prefix option
511
- - submodule: show full path in error message
512
- - t7403: add missing && chaining
513
- - t7403: modernize style
514
- - t7401: make indentation consistent
681
+ (merged to 'next' on 2013-06-23 at f17fb37)
682
+ + submodule: drop the top-level requirement
683
+ + rev-parse: add --prefix option
684
+ + submodule: show full path in error message
685
+ + t7403: add missing && chaining
686
+ + t7403: modernize style
687
+ + t7401: make indentation consistent
688
689
Allow various subcommands of "git submodule" to be run not from the
690
top of the working tree of the superproject.
691
519
- Will merge to 'next'.
520
-
521
-
522
-* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit
523
- (merged to 'next' on 2013-06-17 at 02957d8)
524
- + prompt: squelch error output from cat
525
-
526
- Will merge to 'master'.
527
-
528
-
529
-* jh/libify-note-handling (2013-06-12) 3 commits
530
- (merged to 'next' on 2013-06-20 at 7dac8b6)
531
- + Move create_notes_commit() from notes-merge.c into notes-utils.c
532
- + Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
533
- + finish_copy_notes_for_rewrite(): Let caller provide commit message
534
-
535
- Make it possible to call into copy-notes API from the sequencer code.
536
-
692
Will merge to 'master'.
693
694
540
-* jk/add-i-custom-diff-algo (2013-06-12) 1 commit
695
+* jk/add-i-custom-diff-algo (2013-06-23) 2 commits
696
+ (merged to 'next' on 2013-06-24 at 42e7894)
697
+ + add -i: add extra options at the right place in "diff" command line
698
(merged to 'next' on 2013-06-17 at 48d5d4e)
699
+ add--interactive: respect diff.algorithm
700
@@ -545,41 +702,23 @@ of the repositories listed at
702
703
704
* mh/ref-races (2013-06-20) 11 commits
548
- - for_each_ref: load all loose refs before packed refs
549
- - get_packed_ref_cache: reload packed-refs file when it changes
550
- - add a stat_validity struct
551
- - Extract a struct stat_data from cache_entry
552
- - packed_ref_cache: increment refcount when locked
553
- - do_for_each_entry(): increment the packed refs cache refcount
554
- - refs: manage lifetime of packed refs cache via reference counting
555
- - refs: implement simple transactions for the packed-refs file
556
- - refs: wrap the packed refs cache in a level of indirection
557
- - pack_refs(): split creation of packed refs and entry writing
558
- - repack_without_ref(): split list curation and entry writing
705
+ (merged to 'next' on 2013-06-23 at 71f1a18)
706
+ + for_each_ref: load all loose refs before packed refs
707
+ + get_packed_ref_cache: reload packed-refs file when it changes
708
+ + add a stat_validity struct
709
+ + Extract a struct stat_data from cache_entry
710
+ + packed_ref_cache: increment refcount when locked
711
+ + do_for_each_entry(): increment the packed refs cache refcount
712
+ + refs: manage lifetime of packed refs cache via reference counting
713
+ + refs: implement simple transactions for the packed-refs file
714
+ + refs: wrap the packed refs cache in a level of indirection
715
+ + pack_refs(): split creation of packed refs and entry writing
716
+ + repack_without_ref(): split list curation and entry writing
717
(this branch is used by mh/ref-races-optim-invalidate-cached.)
718
561
- Will merge to 'next'.
562
-
563
-
564
-* mm/rm-coalesce-errors (2013-06-12) 2 commits
565
- (merged to 'next' on 2013-06-20 at c70340c)
566
- + rm: introduce advice.rmHints to shorten messages
567
- + rm: better error message on failure for multiple files
568
-
569
- Give a single message followed by list of paths from "git rm" to
570
- report multiple paths that cannot be removed.
571
-
572
- Will merge to 'master'.
573
-
574
-
575
-* rr/am-quit-empty-then-abort-fix (2013-06-17) 2 commits
576
- (merged to 'next' on 2013-06-20 at f9feae3)
577
- + t/am: use test_path_is_missing() where appropriate
578
- + am: handle stray $dotest directory
579
-
580
- Recent "rebase --autostash" update made it impossible to recover
581
- with "git am --abort" from a repository where "git am" without mbox
582
- was run by mistake and then was killed with "^C".
719
+ "git pack-refs" that races with new ref creation or deletion have
720
+ been susceptible to lossage of refs under right conditions, which
721
+ has been tightened up.
722
723
Will merge to 'master'.
724
@@ -596,90 +735,12 @@ of the repositories listed at
735
Will merge to 'master'.
736
737
599
-* rr/rebase-autostash (2013-06-13) 3 commits
600
- (merged to 'next' on 2013-06-17 at e692317)
601
- + rebase: finish_rebase() in noop rebase
602
- + rebase: finish_rebase() in fast-forward rebase
603
- + rebase: guard against missing files in read_basic_state()
604
-
605
- Will merge to 'master'.
606
-
607
-
608
-* bp/remote-mw-tests (2013-06-14) 1 commit
609
- (merged to 'next' on 2013-06-17 at 2891373)
610
- + git-remote-mediawiki: remove hardcoded version number in the test suite
611
-
612
- Will merge to 'master'.
613
-
614
-
615
-* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits
616
- (merged to 'next' on 2013-06-17 at a41a924)
617
- + git-remote-mediawiki: make error message more precise
618
- + git-remote-mediawiki: add a perlcritic rule in Makefile
619
- + git-remote-mediawiki: add a .perlcriticrc file
620
- + git-remote-mediawiki: clearly rewrite double dereference
621
- + git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
622
- + git-remote-mediawiki: put non-trivial numeric values in constants.
623
- + git-remote-mediawiki: don't use quotes for empty strings
624
- + git-remote-mediawiki: replace "unless" statements with negated "if" statements
625
- + git-remote-mediawiki: brace file handles for print for more clarity
626
- + git-remote-mediawiki: modify strings for a better coding-style
627
- + git-remote-mediawiki: put long code into a subroutine
628
- + git-remote-mediawiki: remove import of unused open2
629
- + git-remote-mediawiki: check return value of open
630
- + git-remote-mediawiki: assign a variable as undef and make proper indentation
631
- + git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
632
- + git-remote-mediawiki: remove unused variable $entry
633
- + git-remote-mediawiki: turn double-negated expressions into simple expressions
634
- + git-remote-mediawiki: change the name of a variable
635
- + git-remote-mediawiki: add newline in the end of die() error messages
636
- + git-remote-mediawiki: change style in a regexp
637
- + git-remote-mediawiki: change style in a regexp
638
- + git-remote-mediawiki: change separator of some regexps
639
- + git-remote-mediawiki: change the behaviour of a split
640
- + git-remote-mediawiki: remove useless regexp modifier (m)
641
- + git-remote-mediawiki: rewrite unclear line of instructions
642
- + git-remote-mediawiki: change syntax of map calls
643
- + git-remote-mediawiki: move a variable declaration at the top of the code
644
- + git-remote-mediawiki: always end a subroutine with a return
645
- + git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
646
- + git-remote-mediawiki: move "use warnings;" before any instruction
647
- + git-remote-mediawiki: make a regexp clearer
648
-
649
- Will merge to 'master'.
650
-
651
-
652
-* jk/apache-test-for-2.4 (2013-06-14) 4 commits
653
- (merged to 'next' on 2013-06-17 at 290e72e)
654
- + t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
655
- + t/lib-httpd/apache.conf: load compat access module in apache 2.4
656
- + t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
657
- + t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
658
-
659
- Will merge to 'master'.
660
-
661
-
662
-* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
663
- (merged to 'next' on 2013-06-20 at d0742fe)
664
- + rebase: use peel_committish() where appropriate
665
- + sh-setup: add new peel_committish() helper
666
- + t/rebase: add failing tests for a peculiar revision
667
-
668
- Allow various commit objects to be given to "git rebase" by ':/look
669
- for this string' syntax, e.g. "git rebase --onto ':/there'".
670
-
671
- Will merge to 'master'.
672
-
673
-
674
-* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
675
- (merged to 'next' on 2013-06-17 at 89e0eab)
676
- + unpack_entry: do not die when we fail to apply a delta
677
- + t5303: drop "count=1" from corruption dd
678
-
679
- Will merge to 'master'.
680
-
681
-
682
-* jc/topo-author-date-sort (2013-06-11) 4 commits
738
+* jc/topo-author-date-sort (2013-06-21) 9 commits
739
+ - t6003: add --author-date-order test
740
+ - topology tests: teach a helper to set author dates as well
741
+ - t6003: add --date-order test
742
+ - topology tests: teach a helper to take abbreviated timestamps
743
+ - t/lib-t6000: style fixes
744
(merged to 'next' on 2013-06-15 at ad4fb48)
745
+ log: --author-date-order
746
+ sort-in-topological-order: use prio-queue
@@ -691,23 +752,22 @@ of the repositories listed at
752
output is topologically sorted and commits in parallel histories
753
are shown intermixed together based on the author timestamp.
754
694
- Needs a test or two.
695
-
696
-
697
-* jg/status-config (2013-06-15) 2 commits
698
- (merged to 'next' on 2013-06-15 at 2bc6547)
699
- + status: introduce status.branch to enable --branch by default
700
- + status: introduce status.short to enable --short by default
701
-
702
- Will merge to 'master'.
755
+ Will merge to 'next'.
756
757
758
* mh/loose-refs-race-with-pack-ref (2013-06-19) 3 commits
706
- - resolve_ref_unsafe(): close race condition reading loose refs
707
- - resolve_ref_unsafe(): handle the case of an SHA-1 within loop
708
- - resolve_ref_unsafe(): extract function handle_missing_loose_ref()
759
+ (merged to 'next' on 2013-06-23 at 2099d0b)
760
+ + resolve_ref_unsafe(): close race condition reading loose refs
761
+ + resolve_ref_unsafe(): handle the case of an SHA-1 within loop
762
+ + resolve_ref_unsafe(): extract function handle_missing_loose_ref()
763
710
- Will merge to 'next'.
764
+ We read loose and packed rerferences in two steps, but after
765
+ deciding to read a loose ref but before actually opening it to read
766
+ it, another process racing with us can unlink it, which would cause
767
+ us to barf. Update the codepath to retry when such a race is
768
+ detected.
769
+
770
+ Will merge to 'master'.
771
772
773
* jk/commit-info-slab (2013-06-07) 3 commits
@@ -723,42 +783,19 @@ of the repositories listed at
783
Will merge to 'master'.
784
785
726
-* fc/sequencer-plug-leak (2013-06-06) 2 commits
727
- (merged to 'next' on 2013-06-20 at 3c94075)
728
- + sequencer: avoid leaking message buffer when refusing to create an empty commit
729
- + sequencer: remove useless indentation
730
-
731
- Plug a small leak in an error codepath.
732
-
733
- Will merge to 'master'.
734
-
735
-
736
-* mz/rebase-tests (2013-06-18) 8 commits
737
- (merged to 'next' on 2013-06-18 at 12cfec8)
738
- + rebase topology tests: fix commit names on case-insensitive file systems
739
- (merged to 'next' on 2013-06-14 at 73f3318)
740
- + tests: move test for rebase messages from t3400 to t3406
741
- + t3406: modernize style
742
- + add tests for rebasing merged history
743
- + add tests for rebasing root
744
- + add tests for rebasing of empty commits
745
- + add tests for rebasing with patch-equivalence present
746
- + add simple tests of consistency across rebase types
747
-
748
- Will merge to 'master'.
749
-
750
-
786
* ap/diff-ignore-blank-lines (2013-06-19) 1 commit
752
- - diff: add --ignore-blank-lines option
787
+ (merged to 'next' on 2013-06-23 at 9cf8e03)
788
+ + diff: add --ignore-blank-lines option
789
790
"git diff" learned a mode that ignores hunks whose change consists
791
only of additions and removals of blank lines, which is the same as
792
"diff -B" (ignore blank lines) of GNU diff.
793
758
- Will merge to 'next'.
794
+ Will merge to 'master'.
795
796
761
-* jx/clean-interactive (2013-06-03) 15 commits
797
+* jx/clean-interactive (2013-06-24) 16 commits
798
+ - test: run testcases with POSIX absolute paths on Windows
799
- test: add t7301 for git-clean--interactive
800
- git-clean: add documentation for interactive git-clean
801
- git-clean: add ask each interactive action
@@ -775,11 +812,12 @@ of the repositories listed at
812
- path.c: refactor relative_path(), not only strip prefix
813
- test: add test cases for relative_path
814
778
- Waiting for a reroll.
779
- $gmane/227710
815
+ Add "interactive" mode to "git clean".
816
817
+ Waiting for reviews.
818
782
-* tr/test-v-and-v-subtest-only (2013-06-18) 8 commits
819
+
820
+* tr/test-v-and-v-subtest-only (2013-06-23) 8 commits
821
- test-lib: support running tests under valgrind in parallel
822
- test-lib: allow prefixing a custom string before "ok N" etc.
823
- test-lib: valgrind for only tests matching a pattern
@@ -793,6 +831,7 @@ of the repositories listed at
831
of the test suite under Valgrind, to speed things up.
832
833
The tip two may be useful in practice but is a tad ugly ;-)
834
+ Rerolled to fix breakage in non-prove tests.
835
836
Will merge to 'next'.
837
@@ -857,3 +896,18 @@ of the repositories listed at
896
. resolve_ref: close race condition for packed refs
897
898
Superseded by mh/ref-races topic, I think.
899
+
900
+
901
+* rr/triangle-push-fix (2013-06-20) 9 commits
902
+ . push: honor branch.*.push
903
+ . SQUASH??? fix git-config push.default description
904
+ . SQUASH??? minimum "simple" safety fix-up
905
+ . t/t5528-push-default: test pushdefault workflows
906
+ . t/t5528-push-default: generalize test_push_*
907
+ . push: remove dead code in setup_push_upstream()
908
+ . push: change `simple` to accommodate triangular workflows
909
+ . config doc: rewrite push.default section
910
+ - t/t5528-push-default: remove redundant test_config lines
911
+ (this branch is tangled with jc/triangle-push-fixup.)
912
+
913
+ A quick rewrite in jc/triangle-push-fixup.