What's cooking (2013/06 #09)
Junio C Hamano committed
Jun 27, 2013 at 15:43 UTC
4696bf7a8f83402deb35c5108f5fc045024acab1
1 file changed
+285
-416
whats-cooking.txt
+285
-416
@@ -1,16 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2013, #08; Tue, 25)
4
-X-master-at: 9832cb9d4dc969fbfacfd1f8940fcbdec18bb930
5
-X-next-at: 8b6e9d859f911784fc6d53d779196c2bb7a34181
3
+Subject: What's cooking in git.git (Jun 2013, #09; Thu, 27)
4
+X-master-at: ebeea528709abf5ee0a0f3e8ad706f7bacc36c05
5
+X-next-at: d7be87e40699fa4046df5713b92b993a842e1a38
6
7
-What's cooking in git.git (Jun 2013, #08; Tue, 25)
7
+What's cooking in git.git (Jun 2013, #09; Thu, 27)
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
+There are quite a few fixes already on 'master' that needed merging
15
+down to 'maint'; I'll be tagging 1.8.3.2 shortly.
16
+
17
You can find the changes described here in the integration branches
18
of the repositories listed at
19
@@ -19,316 +22,213 @@ of the repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
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
-
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
-
63
- Code cleanup.
64
-
65
-
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
-
72
-
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
-
79
-
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
-
87
-
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
25
+* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
26
+ (merged to 'next' on 2013-06-23 at 35f8f85)
27
+ + t/t9802: explicitly name the upstream branch to use as a base
28
+ + builtin/checkout.c: don't leak memory in check_tracking_name
29
92
- Code cleanup.
30
+ Plug a small leak in checkout.
31
32
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
33
+* bc/http-keep-memory-given-to-curl (2013-06-19) 1 commit
34
+ (merged to 'next' on 2013-06-23 at cf91828)
35
+ + http.c: don't rewrite the user:passwd string multiple times
36
101
- Make it possible to call into copy-notes API from the sequencer code.
37
+ Older cURL wanted piece of memory we call it with to be stable, but
38
+ we updated the auth material after handing it to a call.
39
40
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
41
+* fg/submodule-non-ascii-path (2013-06-20) 2 commits
42
+ (merged to 'next' on 2013-06-20 at 122c0b2)
43
+ + t7400: test of UTF-8 submodule names pass under Mac OS
44
+ (merged to 'next' on 2013-06-17 at a0b9fa3)
45
+ + handle multibyte characters in name
46
111
- Allow httpd tests to run with Apache 2.4.
47
+ Many "git submodule" operations do not work on a submodule at a
48
+ path whose name is not in ASCII.
49
50
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
51
+* jk/add-i-custom-diff-algo (2013-06-23) 2 commits
52
+ (merged to 'next' on 2013-06-24 at 42e7894)
53
+ + add -i: add extra options at the right place in "diff" command line
54
+ (merged to 'next' on 2013-06-17 at 48d5d4e)
55
+ + add--interactive: respect diff.algorithm
56
+
57
119
- Makefile cleanup.
58
+* jk/pull-into-dirty-unborn (2013-06-20) 2 commits
59
+ (merged to 'next' on 2013-06-23 at ab4b111)
60
+ + pull: merge into unborn by fast-forwarding from empty tree
61
+ + pull: update unborn branch tip after index
62
63
+ "git pull" into nothing trashed "local changes" that were in the
64
+ index, and this avoids it.
65
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
66
126
- Code cleanup.
67
+* kb/diff-blob-blob-doc (2013-06-18) 1 commit
68
+ (merged to 'next' on 2013-06-20 at 34e896a)
69
+ + Documentation: Move "git diff <blob> <blob>"
70
71
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
72
+* mm/merge-in-dirty-worktree-doc (2013-06-18) 1 commit
73
+ (merged to 'next' on 2013-06-20 at 21b3267)
74
+ + Documentation/git-merge.txt: weaken warning about uncommited changes
75
134
- Follow-up to an earlier fix.
76
77
+* mm/push-force-is-dangerous (2013-06-18) 1 commit
78
+ (merged to 'next' on 2013-06-20 at a6a8913)
79
+ + Documentation/git-push.txt: explain better cases where --force is dangerous
80
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
81
142
- Give a single message followed by list of paths from "git rm" to
143
- report multiple paths that cannot be removed.
82
+* mt/send-email-cc-match-fix (2013-06-20) 2 commits
83
+ (merged to 'next' on 2013-06-23 at a2656b3)
84
+ + send-email: sanitize author when writing From line
85
+ + send-email: add test for duplicate utf8 name
86
87
+ Logic used by git-send-email to suppress cc mishandled names that
88
+ need RFC2047 quoting.
89
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
90
91
+* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
92
+ (merged to 'next' on 2013-06-20 at 7507a48)
93
+ + fix "builtin-*" references to be "builtin/*"
94
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
95
96
+* rr/cherry-pick-fast-forward-reflog-message (2013-06-19) 1 commit
97
+ (merged to 'next' on 2013-06-24 at 8b6e9d8)
98
+ + sequencer: write useful reflog message for fast-forward
99
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
100
+ The reflog message created when "git cherry-pick" fast-forwarded
101
+ did not say anything but "cherry-pick", but it now says
102
+ "cherry-pick: fast-forward".
103
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".
104
105
+* rr/rebase-stash-store (2013-06-17) 5 commits
106
+ (merged to 'next' on 2013-06-23 at 2398dad)
107
+ + rebase: use 'git stash store' to simplify logic
108
+ + stash: introduce 'git stash store'
109
+ + stash: simplify option parser for create
110
+ + stash doc: document short form -p in synopsis
111
+ + stash doc: add a warning about using create
112
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
113
+ Finishing touches for the "git rebase --autostash" feature
114
+ introduced earlier.
115
116
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()
117
+* tr/maint-apply-non-git-patch-parsefix (2013-06-21) 1 commit
118
+ (merged to 'next' on 2013-06-24 at 50583a5)
119
+ + apply: carefully strdup a possibly-NULL name
120
121
+ Fix for the codepath to parse patches that add new files, generated
122
+ by programs other than Git. THis is an old breakage in v1.7.11 and
123
+ will need to be merged down to the maintanance tracks.
124
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
125
192
- Allow various commit objects to be given to "git rebase" by ':/look
193
- for this string' syntax, e.g. "git rebase --onto ':/there'".
126
+* vl/typofix (2013-06-19) 1 commit
127
+ (merged to 'next' on 2013-06-23 at a057524)
128
+ + random typofixes (committed missing a 't', successful missing an 's')
129
130
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
131
+* wk/doc-git-has-grown (2013-06-23) 1 commit
132
+ (merged to 'next' on 2013-06-23 at 256263d)
133
+ + user-manual: Update download size for Git and the kernel
134
200
- Code clean-up.
135
136
+* ys/cygstart (2013-06-21) 1 commit
137
+ (merged to 'next' on 2013-06-24 at 822d9ca)
138
+ + web--browse: support /usr/bin/cygstart on Cygwin
139
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
140
+ On "Cygwin", recognize "cygstart" as a possible way to start a web
141
+ browser (used in "help -w" and "instaweb" among others).
142
143
--------------------------------------------------
144
[New Topics]
145
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
146
+* bp/mediawiki-preview (2013-06-26) 5 commits
147
+ - git-remote-mediawiki: Add preview subcommand into git mw.
148
+ - git-remote-mediawiki: Adding git-mw command
149
+ - git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki
150
+ - git-remote-mediawiki: new git bin-wrapper for developement
151
+ - git-remote-mediawiki: Introduction of Git::Mediawiki.pm
152
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.
153
227
- Will merge to 'next'.
154
+* ed/color-prompt (2013-06-26) 5 commits
155
+ - git-prompt.sh: add missing information in comments
156
+ - git-prompt.sh: do not print duplicate clean color code
157
+ - t9903: remove redundant tests
158
+ - git-prompt.sh: refactor colored prompt code
159
+ - t9903: add tests for git-prompt pcmode
160
161
+ Code clean-up for in-prompt status script (in contrib/).
162
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
163
+ Will merge to 'next' after getting the merge sanity-checked.
164
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.
165
238
- Will merge to 'master'.
166
+* fg/submodule-clone-depth (2013-06-26) 1 commit
167
+ - Add depth to submodule update
168
169
+ Allow shallow-cloning of submodules with "git submodule update".
170
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
171
+ Will merge to 'next'.
172
247
- Update documentation to update to more recent realities.
173
249
- Will merge to 'next'.
174
+* ft/doc-git-transport (2013-06-26) 1 commit
175
+ (merged to 'next' on 2013-06-27 at 4a7d248)
176
+ + documentation: add git:// transport security notice
177
178
+ Will merge to 'master'.
179
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
180
256
- On "Cygwin", recognize "cygstart" as a possible way to start a web
257
- browser (used in "help -w" and "instaweb" among others).
181
+* rr/column-doc (2013-06-26) 1 commit
182
+ (merged to 'next' on 2013-06-27 at 99497e1)
183
+ + column doc: rewrite documentation for column.ui
184
185
Will merge to 'master'.
186
187
262
-* jc/maint-diff-core-safecrlf (2013-06-25) 1 commit
263
- - diff: demote core.safecrlf=true to core.safecrlf=warn
188
+* sb/mailmap-merijn-brand (2013-06-25) 1 commit
189
+ (merged to 'next' on 2013-06-27 at 2dd247a)
190
+ + .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"
191
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.
192
+ Will merge to 'master'.
193
269
- Will hold for a while to see if anybody can come up with better
270
- tests.
194
195
+* ap/rebase-multiple-fixups (2013-06-27) 1 commit
196
+ - rebase -i: handle fixup! fixup! in --autosquash
197
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
198
+ Having multiple "fixup!" on a line in the rebase instruction sheet
199
+ did not work very well with "git rebase -i --autosquash".
200
279
- Waiting for reviews.
201
+ Will merge to 'next'.
202
203
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'.
204
+* jc/pull-training-wheel (2013-06-27) 1 commit
205
+ - pull: require choice between rebase/merge on non-fast-forward pull
206
207
+ Make "git pull" refuse with "it does not fast forward; choose between
208
+ 'pull --merge' and 'pull --rebase'".
209
309
-* af/rebase-i-merge-options (2013-06-25) 2 commits
310
- - SQUASH???
311
- - Do not ignore merge options in interactive rebase
210
313
- "git rebase -i" now honors --strategy and -X options.
211
+* kb/am-deprecate-resolved (2013-06-27) 1 commit
212
+ - am: replace uses of --resolved with --continue
213
214
+ Promote "git am --continue" over "git am --resolved" for UI
215
+ consistency.
216
316
-* rj/cygwin-remove-cheating-lstat (2013-06-25) 1 commit
317
- - cygwin: Remove the Win32 l/stat() implementation
217
+ Will merge to 'next'.
218
219
--------------------------------------------------
220
[Stalled]
221
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
222
+* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
223
+ - ### DONTMERGE: needs better explanation on what config they need
224
+ - pack-refs.c: Add missing call to git_config()
225
+ - show-ref.c: Add missing call to git_config()
226
327
- "log --format=" did not honor i18n.logoutputencoding configuration
328
- and this is a beginning of the series that attempts to fix it.
227
+ The changes themselves are probably good, but it is unclear what
228
+ basic setting needs to be read for which exact operation.
229
330
- Waiting for a reroll, not to add dependency on new 8859-5 locale.
331
- $gmane/228532
230
+ Waiting for clarification.
231
+ $gmane/228294
232
233
234
* fc/contrib-related (2013-06-09) 5 commits
@@ -459,12 +359,118 @@ of the repositories listed at
359
--------------------------------------------------
360
[Cooking]
361
362
+* as/log-output-encoding-in-user-format (2013-06-26) 5 commits
363
+ - pretty: --format output should honor logOutputEncoding
364
+ - pretty: Add failing tests: --format output should honor logOutputEncoding
365
+ - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
366
+ - t7102 (reset): don't hardcode SHA-1 in expected outputs
367
+ - t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
368
+
369
+ "log --format=" did not honor i18n.logoutputencoding configuration
370
+ and this is a beginning of the series that attempts to fix it.
371
+
372
+ Will merge to 'next'.
373
+
374
+
375
+* rr/remote-branch-config-refresh (2013-06-23) 9 commits
376
+ (merged to 'next' on 2013-06-26 at 48746e1)
377
+ + t/t5505-remote: test multiple push/pull in remotes-file
378
+ + ls-remote doc: don't encourage use of branches-file
379
+ + ls-remote doc: rewrite <repository> paragraph
380
+ + ls-remote doc: fix example invocation on git.git
381
+ + t/t5505-remote: test url-with-# in branches-file
382
+ + remote: remove dead code in read_branches_file()
383
+ + t/t5505-remote: use test_path_is_missing
384
+ + t/t5505-remote: test push-refspec in branches-file
385
+ + t/t5505-remote: modernize style
386
+
387
+ The original way to specify remote repository using .git/branches/
388
+ used to have a nifty feature. The code to support the feature was
389
+ still in a function but the caller was changed not to call it 5
390
+ years ago, breaking that feature and leaving the supporting code
391
+ unreachable.
392
+
393
+ Will merge to 'master'.
394
+
395
+
396
+* wk/doc-in-linux-3.x-era (2013-06-22) 4 commits
397
+ (merged to 'next' on 2013-06-26 at a24e9e6)
398
+ + Documentation: Update 'linux-2.6.git' -> 'linux.git'
399
+ + Documentation: Update the NFS remote examples to use the staging repo
400
+ + doc/clone: Pick more compelling paths for the --reference example
401
+ + doc/clone: Remove the '--bare -l -s' example
402
+
403
+ Update documentation to match more recent realities.
404
+
405
+ Will merge to 'master'.
406
+
407
+
408
+* jc/maint-diff-core-safecrlf (2013-06-25) 1 commit
409
+ - diff: demote core.safecrlf=true to core.safecrlf=warn
410
+
411
+ "git diff" refused to even show difference when core.safecrlf is
412
+ set to true (i.e. error out) and there are offending lines in the
413
+ working tree files.
414
+
415
+ Will hold for a while to see if anybody can come up with better
416
+ tests.
417
+
418
+
419
+* jk/fast-import-empty-ls (2013-06-23) 4 commits
420
+ - fast-import: allow moving the root tree
421
+ - fast-import: allow ls or filecopy of the root tree
422
+ - fast-import: set valid mode on root tree in "ls"
423
+ - t9300: document fast-import empty path issues
424
+
425
+ Waiting for reviews.
426
+
427
+
428
+* sg/bash-prompt (2013-06-24) 16 commits
429
+ (merged to 'next' on 2013-06-27 at 09fda6a)
430
+ + bash prompt: mention that PROMPT_COMMAND mode is faster
431
+ + bash prompt: avoid command substitution when finalizing gitstring
432
+ + bash prompt: avoid command substitution when checking for untracked files
433
+ + bash prompt: use bash builtins to check stash state
434
+ + bash prompt: use bash builtins to check for unborn branch for dirty state
435
+ + bash prompt: combine 'git rev-parse' for detached head
436
+ + bash prompt: combine 'git rev-parse' executions in the main code path
437
+ + bash prompt: use bash builtins to find out current branch
438
+ + bash prompt: use bash builtins to find out rebase state
439
+ + bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()
440
+ + bash prompt: return early from __git_ps1() when not in a git repository
441
+ + bash prompt: print unique detached HEAD abbreviated object name
442
+ + bash prompt: add a test for symbolic link symbolic refs
443
+ + completion, bash prompt: move __gitdir() tests to completion test suite
444
+ + bash prompt: use 'write_script' helper in interactive rebase test
445
+ + bash prompt: fix redirection coding style in tests
446
+ (this branch is used by sg/bash-prompt-premerge.)
447
+
448
+ Will merge to 'master'.
449
+
450
+
451
+* af/rebase-i-merge-options (2013-06-25) 2 commits
452
+ - SQUASH???
453
+ - Do not ignore merge options in interactive rebase
454
+
455
+ "git rebase -i" now honors --strategy and -X options.
456
+
457
+ Waiting for response to review comments.
458
+
459
+
460
+* rj/cygwin-remove-cheating-lstat (2013-06-25) 1 commit
461
+ - cygwin: Remove the Win32 l/stat() implementation
462
+
463
+ Seems that this gives different performance results to different
464
+ people.
465
+
466
+
467
* 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
+ (merged to 'next' on 2013-06-26 at 73cbb69)
469
+ + t/t5528-push-default: test pushdefault workflows
470
+ + t/t5528-push-default: generalize test_push_*
471
+ + push: change `simple` to accommodate triangular workflows
472
+ + config doc: rewrite push.default section
473
+ + t/t5528-push-default: remove redundant test_config lines
474
(this branch is tangled with rr/triangle-push-fix.)
475
476
Earlier remote.pushdefault (and per-branch branch.*.pushremote)
@@ -493,8 +499,6 @@ of the repositories listed at
499
tentatively defines it as the same as 'current', but we may have
500
to tighten it to avoid surprises in some way.
501
496
- Will merge to 'next'.
497
-
502
503
* jg/status-config (2013-06-24) 4 commits
504
- status/commit: make sure --porcelain is not affected by user-facing config
@@ -509,17 +513,9 @@ of the repositories listed at
513
The bottom two has been graduated to 'master' but then reverted.
514
The tip two are quick attempts to fix the fallout. The one for
515
status.short looks correct; the other one is still in flux and
512
- under discussion, waiting for alternative cleaner patches.
516
+ under discussion.
517
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'.
518
+ Waiting for possible alternative cleaner patches for the tip one.
519
520
521
* jc/reflog-doc (2013-06-19) 1 commit
@@ -531,17 +527,6 @@ of the repositories listed at
527
scripts, so fixing it is not all that urgent.
528
529
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
-
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
-
530
* mh/ref-races-optim-invalidate-cached (2013-06-20) 1 commit
531
- refs: do not invalidate the packed-refs cache unnecessarily
532
(this branch uses mh/ref-races.)
@@ -549,39 +534,15 @@ of the repositories listed at
534
Optional.
535
536
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
-
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
-
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
-
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
-
537
* rr/rebase-checkout-reflog (2013-06-23) 7 commits
538
- rebase -i: use a better reflog message
539
- rebase: use a better reflog message
540
- 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
541
+ (merged to 'next' on 2013-06-27 at 4d99efa)
542
+ + status: do not depend on rebase reflog messages
543
+ + t/t2021-checkout-last: "checkout -" should work after a rebase finishes
544
+ + wt-status: remove unused field in grab_1st_switch_cbdata
545
+ + t7512: test "detached from" as well
546
547
Invocations of "git checkout" used internally by "git rebase" were
548
counted as "checkout", and affected later "git checkout -" to the
@@ -591,74 +552,6 @@ of the repositories listed at
552
Will split and merge to 'next'.
553
554
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
-
602
- Finishing touches for the "git rebase --autostash" feature
603
- introduced earlier.
604
-
605
- Will merge to 'master'.
606
-
607
-
608
-* mm/push-force-is-dangerous (2013-06-18) 1 commit
609
- (merged to 'next' on 2013-06-20 at a6a8913)
610
- + Documentation/git-push.txt: explain better cases where --force is dangerous
611
-
612
- Will merge to 'master'.
613
-
614
-
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()
618
- - show-ref.c: Add missing call to git_config()
619
-
620
- The changes themselves are probably good, but it is unclear what
621
- basic setting needs to be read for which exact operation.
622
-
623
- Waiting for clarification.
624
- $gmane/228294
625
-
626
-
627
-* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
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
-
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
638
- (merged to 'next' on 2013-06-20 at 34e896a)
639
- + Documentation: Move "git diff <blob> <blob>"
640
-
641
- Will merge to 'master'.
642
-
643
-
644
-* mm/merge-in-dirty-worktree-doc (2013-06-18) 1 commit
645
- (merged to 'next' on 2013-06-20 at 21b3267)
646
- + Documentation/git-merge.txt: weaken warning about uncommited changes
647
-
648
- Will merge to 'master'.
649
-
650
-
651
-* mt/send-email-cc-match-fix (2013-06-20) 2 commits
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
-
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
-
555
* nk/name-rev-abbreviated-refs (2013-06-18) 1 commit
556
(merged to 'next' on 2013-06-23 at 2ec9e05)
557
+ name-rev: allow to specify a subpath for --refs option
@@ -670,13 +563,6 @@ of the repositories listed at
563
Will merge to 'master'.
564
565
673
-* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
674
- (merged to 'next' on 2013-06-20 at 7507a48)
675
- + fix "builtin-*" references to be "builtin/*"
676
-
677
- Will merge to 'master'.
678
-
679
-
566
* jk/submodule-subdirectory-ok (2013-06-17) 6 commits
567
(merged to 'next' on 2013-06-23 at f17fb37)
568
+ submodule: drop the top-level requirement
@@ -692,15 +578,6 @@ of the repositories listed at
578
Will merge to 'master'.
579
580
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
-
701
- Will merge to 'master'.
702
-
703
-
581
* mh/ref-races (2013-06-20) 11 commits
582
(merged to 'next' on 2013-06-23 at 71f1a18)
583
+ for_each_ref: load all loose refs before packed refs
@@ -723,24 +600,13 @@ of the repositories listed at
600
Will merge to 'master'.
601
602
726
-* fg/submodule-non-ascii-path (2013-06-20) 2 commits
727
- (merged to 'next' on 2013-06-20 at 122c0b2)
728
- + t7400: test of UTF-8 submodule names pass under Mac OS
729
- (merged to 'next' on 2013-06-17 at a0b9fa3)
730
- + handle multibyte characters in name
731
-
732
- Many "git submodule" operations do not work on a submodule at a
733
- path whose name is not in ASCII.
734
-
735
- Will merge to 'master'.
736
-
737
-
603
* 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
604
+ (merged to 'next' on 2013-06-26 at 9283719)
605
+ + t6003: add --author-date-order test
606
+ + topology tests: teach a helper to set author dates as well
607
+ + t6003: add --date-order test
608
+ + topology tests: teach a helper to take abbreviated timestamps
609
+ + t/lib-t6000: style fixes
610
(merged to 'next' on 2013-06-15 at ad4fb48)
611
+ log: --author-date-order
612
+ sort-in-topological-order: use prio-queue
@@ -752,7 +618,7 @@ of the repositories listed at
618
output is topologically sorted and commits in parallel histories
619
are shown intermixed together based on the author timestamp.
620
755
- Will merge to 'next'.
621
+ Will merge to 'master'.
622
623
624
* mh/loose-refs-race-with-pack-ref (2013-06-19) 3 commits
@@ -794,7 +660,7 @@ of the repositories listed at
660
Will merge to 'master'.
661
662
797
-* jx/clean-interactive (2013-06-24) 16 commits
663
+* jx/clean-interactive (2013-06-26) 16 commits
664
- test: run testcases with POSIX absolute paths on Windows
665
- test: add t7301 for git-clean--interactive
666
- git-clean: add documentation for interactive git-clean
@@ -805,27 +671,32 @@ of the repositories listed at
671
- git-clean: add colors to interactive git-clean
672
- git-clean: show items of del_list in columns
673
- git-clean: add support for -i/--interactive
808
- - git-clean: refactor git-clean into two phases
809
- - Refactor write_name_quoted_relative, remove unused params
810
- - Refactor quote_path_relative, remove unused params
811
- - quote.c: remove path_relative, use relative_path instead
812
- - path.c: refactor relative_path(), not only strip prefix
813
- - test: add test cases for relative_path
674
+ (merged to 'next' on 2013-06-26 at f7be2d8)
675
+ + git-clean: refactor git-clean into two phases
676
+ + write_name{_quoted_relative,}(): remove redundant parameters
677
+ + quote_path_relative(): remove redundant parameter
678
+ + quote.c: substitute path_relative with relative_path
679
+ + path.c: refactor relative_path(), not only strip prefix
680
+ + test: add test cases for relative_path
681
682
Add "interactive" mode to "git clean".
683
817
- Waiting for reviews.
684
+ The early part to refactor relative path related helper functions
685
+ looked sensible. The actual "clean interactive" may want to be
686
+ discussed further by interested parties before the topic is fully
687
+ merged to 'next'.
688
689
690
* 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
824
- - test-lib: verbose mode for only tests matching a pattern
825
- - test-lib: self-test that --verbose works
826
- - test-lib: rearrange start/end of test_expect_* and test_skip
827
- - test-lib: refactor $GIT_SKIP_TESTS matching
828
- - test-lib: enable MALLOC_* for the actual tests
691
+ (merged to 'next' on 2013-06-26 at 8ff4d84)
692
+ + test-lib: support running tests under valgrind in parallel
693
+ + test-lib: allow prefixing a custom string before "ok N" etc.
694
+ + test-lib: valgrind for only tests matching a pattern
695
+ + test-lib: verbose mode for only tests matching a pattern
696
+ + test-lib: self-test that --verbose works
697
+ + test-lib: rearrange start/end of test_expect_* and test_skip
698
+ + test-lib: refactor $GIT_SKIP_TESTS matching
699
+ + test-lib: enable MALLOC_* for the actual tests
700
701
Allows N instances of tests run in parallel, each running 1/N parts
702
of the test suite under Valgrind, to speed things up.
@@ -833,8 +704,6 @@ of the repositories listed at
704
The tip two may be useful in practice but is a tad ugly ;-)
705
Rerolled to fix breakage in non-prove tests.
706
836
- Will merge to 'next'.
837
-
707
708
* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
709
- git add: -u/-A now affects the entire working tree
@@ -907,7 +776,7 @@ of the repositories listed at
776
. push: remove dead code in setup_push_upstream()
777
. push: change `simple` to accommodate triangular workflows
778
. config doc: rewrite push.default section
910
- - t/t5528-push-default: remove redundant test_config lines
779
+ + t/t5528-push-default: remove redundant test_config lines
780
(this branch is tangled with jc/triangle-push-fixup.)
781
913
- A quick rewrite in jc/triangle-push-fixup.
782
+ Superseded by jc/triangle-push-fixup.