What's cooking (2013/01 #06)
Junio C Hamano committed
Jan 14, 2013 at 14:23 UTC
70e0e3ee1be795f246402bd6fa321865ee4a68c9
1 file changed
+308
-376
whats-cooking.txt
+308
-376
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2013, #05; Fri, 11)
4
-X-master-at: a27d83aee906a767ae12dc39cd0aa5b42448bd6c
5
-X-next-at: b8b30b1c3494e2bbefedcefe98fd2bab94927a80
3
+Subject: What's cooking in git.git (Jan 2013, #06; Mon, 14)
4
+X-master-at: eacf0117752780bf418d352a6ad2f033aeda1cce
5
+X-next-at: 6b4d555ffede903f47d5e5fa51348b27b331f791
6
7
-What's cooking in git.git (Jan 2013, #05; Fri, 11)
7
+What's cooking in git.git (Jan 2013, #06; Mon, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -20,265 +20,228 @@ repositories listed at
20
http://git-blame.blogspot.com/p/git-public-repositories.html
21
22
--------------------------------------------------
23
-[Graduated to "master"]
24
-
25
-* as/api-allocation-doc (2013-01-06) 1 commit
26
- (merged to 'next' on 2013-01-08 at c80b544)
27
- + api-allocation-growing.txt: encourage better variable naming
28
-
29
-
30
-* as/dir-c-cleanup (2012-12-28) 10 commits
31
- (merged to 'next' on 2013-01-08 at 5aee090)
32
- + dir.c: rename free_excludes() to clear_exclude_list()
33
- + dir.c: refactor is_path_excluded()
34
- + dir.c: refactor is_excluded()
35
- + dir.c: refactor is_excluded_from_list()
36
- + dir.c: rename excluded() to is_excluded()
37
- + dir.c: rename excluded_from_list() to is_excluded_from_list()
38
- + dir.c: rename path_excluded() to is_path_excluded()
39
- + dir.c: rename cryptic 'which' variable to more consistent name
40
- + Improve documentation and comments regarding directory traversal API
41
- + api-directory-listing.txt: update to match code
42
- (this branch is used by as/check-ignore.)
43
-
44
- Refactor and generally clean up the directory traversal API
45
- implementation.
46
-
47
-
48
-* aw/rebase-am-failure-detection (2012-10-11) 1 commit
49
- (merged to 'next' on 2013-01-07 at 9e2ee43)
50
- + rebase: Handle cases where format-patch fails
23
+[New Topics]
24
52
- Originally merged to 'next' on 2013-01-02
25
+* jc/cvsimport-upgrade (2013-01-14) 8 commits
26
+ - t9600: adjust for new cvsimport
27
+ - t9600: further prepare for sharing
28
+ - cvsimport-3: add a sample test
29
+ - cvsimport: make tests reusable for cvsimport-3
30
+ - cvsimport: start adding cvsps 3.x support
31
+ - cvsimport: introduce a version-switch wrapper
32
+ - cvsimport: allow setting a custom cvsps (2.x) program name
33
+ - Makefile: add description on PERL/PYTHON_PATH
34
+
35
+ The most important part of this series is the addition of the new
36
+ cvsimport by Eric Raymond that works with cvsps 3.x. Given some
37
+ distros have inertia to be conservative, Git with cvsimport that
38
+ does not work with both 3.x will block adoption of cvsps 3.x by
39
+ them, and shipping Git with cvsimport that does not work with cvsps
40
+ 2.x will block such a version of Git, so we'll do the proven "both
41
+ old and new are available, but we aim to deprecate and remove the
42
+ old one in due time" strategy that we used successfully in the
43
+ past.
44
+
45
+
46
+* as/pre-push-hook (2013-01-14) 3 commits
47
+ - Add sample pre-push hook script
48
+ - push: Add support for pre-push hooks
49
+ - hooks: Add function to check if a hook exists
50
+
51
+ Add an extra hook so that "git push" that is run without making
52
+ sure what is being pushed is sane can be checked and rejected (as
53
+ opposed to the user deciding not pushing).
54
+
55
+
56
+* dl/am-hg-locale (2013-01-14) 1 commit
57
+ - am: invoke perl's strftime in C locale
58
+
59
+ Datestamp recorded in "Hg" format patch was reformatted incorrectly
60
+ to an e-mail looking date using locale dependant strftime, causing
61
+ patch application to fail.
62
+
63
+
64
+* jk/config-parsing-cleanup (2013-01-14) 7 commits
65
+ - [DONTMERGE] reroll coming
66
+ - submodule: simplify memory handling in config parsing
67
+ - submodule: use match_config_key when parsing config
68
+ - userdiff: drop parse_driver function
69
+ - convert some config callbacks to match_config_key
70
+ - archive-tar: use match_config_key when parsing config
71
+ - config: add helper function for parsing key names
72
54
- Save output from format-patch command in a temporary file, just in
55
- case it aborts, to give a better failure-case behaviour.
73
+ Expecting a reroll.
74
75
+* mp/diff-algo-config (2013-01-14) 3 commits
76
+ - diff: Introduce --diff-algorithm command line option
77
+ - config: Introduce diff.algorithm variable
78
+ - git-completion.bash: Autocomplete --minimal and --histogram for git-diff
79
58
-* jc/comment-cygwin-win32api-in-makefile (2013-01-06) 1 commit
59
- (merged to 'next' on 2013-01-08 at dea04e8)
60
- + Makefile: add comment on CYGWIN_V15_WIN32API
80
+ Add diff.algorithm configuration so that the user does not type
81
+ "diff --histogram".
82
83
+ Expecting a reroll.
84
63
-* jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit
64
- (merged to 'next' on 2013-01-07 at 497bf10)
65
- + merge --no-edit: do not credit people involved in the side branch
85
+* ph/rebase-preserve-all-merges (2013-01-14) 1 commit
86
+ - rebase --preserve-merges: keep all merge commits including empty ones
87
67
- Originally merged to 'next' on 2013-01-02
88
+ An earlier change to add --keep-empty option broke "git rebase
89
+ --preserve-merges" and lost merge commits that end up being the
90
+ same as its parent.
91
69
- Stop spending cycles to compute information to be placed on
70
- commented lines in "merge --no-edit".
92
+ Will merge to 'next'.
93
94
+* rs/archive-tar-config-parsing-fix (2013-01-14) 1 commit
95
+ - archive-tar: fix sanity check in config parsing
96
73
-* jk/config-uname (2013-01-03) 1 commit
74
- (merged to 'next' on 2013-01-08 at f986500)
75
- + Makefile: hoist uname autodetection to config.mak.uname
97
+ Configuration parsing for tar.* configuration variables were
98
+ broken; Peff's config parsing clean-up topic will address the same
99
+ breakage, so this may be superseded by that other topic.
100
77
- Move the bits to set fallback default based on the platform from
78
- the main Makefile to a separate file, so that it can be included in
79
- Makefiles in subdirectories.
101
102
+* rs/pretty-use-prefixcmp (2013-01-14) 1 commit
103
+ - pretty: use prefixcmp instead of memcmp on NUL-terminated strings
104
82
-* jl/interrupt-clone-remove-separate-git-dir (2013-01-05) 1 commit
83
- (merged to 'next' on 2013-01-08 at 568f874)
84
- + clone: support atomic operation with --separate-git-dir
105
+ Will merge to 'next'.
106
86
- When "git clone --separate-git-dir" is interrupted, we failed to
87
- remove the real location we created the repository.
107
+--------------------------------------------------
108
+[Graduated to "master"]
109
110
+* ap/status-ignored-in-ignored-directory (2013-01-07) 3 commits
111
+ (merged to 'next' on 2013-01-10 at 20f7476)
112
+ + status: always report ignored tracked directories
113
+ (merged to 'next' on 2013-01-07 at 2a20b19)
114
+ + git-status: Test --ignored behavior
115
+ + dir.c: Make git-status --ignored more consistent
116
90
-* mz/pick-unborn (2012-12-23) 2 commits
91
- (merged to 'next' on 2013-01-07 at c6c062b)
92
- + learn to pick/revert into unborn branch
93
- + tests: move test_cmp_rev to test-lib-functions
117
+ Output from "git status --ignored" showed an unexpected interaction
118
+ with "--untracked".
119
95
- Originally merged to 'next' on 2013-01-02
120
97
- Allows "git cherry-pick $commit" when you do not have any history
98
- behind HEAD yet.
121
+* fc/remote-testgit-feature-done (2012-10-29) 1 commit
122
+ (merged to 'next' on 2013-01-10 at 3132a60)
123
+ + remote-testgit: properly check for errors
124
125
+ In the longer term, tightening rules is a good thing to do, and
126
+ because nobody who has worked in the remote helper area seems to be
127
+ interested in reviewing this, I would assume they do not think
128
+ such a retroactive tightening will affect their remote helpers. So
129
+ let's advance this topic to see what happens.
130
101
-* nd/wildmatch (2013-01-01) 18 commits
102
- (merged to 'next' on 2013-01-07 at 2a39f7d)
103
- + wildmatch: replace variable 'special' with better named ones
104
- + compat/fnmatch: respect NO_FNMATCH* even on glibc
105
- + wildmatch: fix "**" special case
106
- + t3070: Disable some failing fnmatch tests
107
- + test-wildmatch: avoid Windows path mangling
108
- + Support "**" wildcard in .gitignore and .gitattributes
109
- + wildmatch: make /**/ match zero or more directories
110
- + wildmatch: adjust "**" behavior
111
- + wildmatch: fix case-insensitive matching
112
- + wildmatch: remove static variable force_lower_case
113
- + wildmatch: make wildmatch's return value compatible with fnmatch
114
- + t3070: disable unreliable fnmatch tests
115
- + Integrate wildmatch to git
116
- + wildmatch: follow Git's coding convention
117
- + wildmatch: remove unnecessary functions
118
- + Import wildmatch from rsync
119
- + ctype: support iscntrl, ispunct, isxdigit and isprint
120
- + ctype: make sane_ctype[] const array
121
- (this branch is used by nd/retire-fnmatch.)
131
123
- Originally merged to 'next' on 2013-01-01
132
+* jc/blame-no-follow (2012-09-21) 2 commits
133
+ (merged to 'next' on 2013-01-10 at 201c7f4)
134
+ + blame: pay attention to --no-follow
135
+ + diff: accept --no-follow option
136
125
- Allows pathname patterns in .gitignore and .gitattributes files
126
- with double-asterisks "foo/**/bar" to match any number of directory
127
- hierarchies.
137
+ Teaches "--no-follow" option to "git blame" to disable its
138
+ whole-file rename detection.
139
140
130
-* rs/leave-base-name-in-name-field-of-tar (2013-01-05) 1 commit
131
- (merged to 'next' on 2013-01-08 at 98f325e)
132
- + archive-tar: split long paths more carefully
141
+* jc/format-patch-reroll (2013-01-03) 9 commits
142
+ (merged to 'next' on 2013-01-07 at 0e007e6)
143
+ + format-patch: give --reroll-count a short synonym -v
144
+ + format-patch: document and test --reroll-count
145
+ + format-patch: add --reroll-count=$N option
146
+ + get_patch_filename(): split into two functions
147
+ + get_patch_filename(): drop "just-numbers" hack
148
+ + get_patch_filename(): simplify function signature
149
+ + builtin/log.c: stop using global patch_suffix
150
+ + builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()
151
+ + builtin/log.c: drop unused "numbered" parameter from make_cover_letter()
152
134
- Improve compatibility with implementations of "tar" that do not
135
- like empty name field in header (with the additional prefix field
136
- holding everything).
153
+ Originally merged to 'next' on 2013-01-04
154
155
+ Teach "format-patch" to prefix v4- to its output files for the
156
+ fourth iteration of a patch series, to make it easier for the
157
+ submitter to keep separate copies for iterations.
158
139
-* tb/test-shell-lint (2013-01-02) 1 commit
140
- (merged to 'next' on 2013-01-07 at 0bca54a)
141
- + test: Add check-non-portable-shell.pl
159
143
- Originally merged to 'next' on 2013-01-04
160
+* jc/merge-blobs (2012-12-26) 5 commits
161
+ (merged to 'next' on 2013-01-08 at 582ca38)
162
+ + merge-tree: fix d/f conflicts
163
+ + merge-tree: add comments to clarify what these functions are doing
164
+ + merge-tree: lose unused "resolve_directories"
165
+ + merge-tree: lose unused "flags" from merge_list
166
+ + Which merge_file() function do you mean?
167
145
- Check for common mistakes in the test scripts, based on simple
146
- pattern-matching.
168
+ Update the disused merge-tree proof-of-concept code.
169
148
---------------------------------------------------
149
-[New Topics]
170
171
* jk/maint-fast-import-doc-reorder (2013-01-09) 2 commits
172
(merged to 'next' on 2013-01-10 at 9f3950d)
173
+ git-fast-import(1): reorganise options
174
+ git-fast-import(1): combine documentation of --[no-]relative-marks
175
156
- Will merge to 'master'.
157
-
176
177
* jk/shortlog-no-wrap-doc (2013-01-09) 1 commit
178
(merged to 'next' on 2013-01-10 at c79898a)
179
+ git-shortlog(1): document behaviour of zero-width wrap
180
163
- Will merge to 'master'.
164
-
165
-
166
-* rt/commit-cleanup-config (2013-01-10) 1 commit
167
- - commit: make default of "cleanup" option configurable
168
-
169
- Add a configuration variable to set default clean-up mode other
170
- than "strip".
171
-
172
- Will merge to 'next'.
173
-
174
-
175
-* jc/custom-comment-char (2013-01-10) 1 commit
176
- - Allow custom "comment char"
177
-
178
- An illustration to show codepaths that need to be touched to change
179
- the hint lines in the edited text to begin with something other
180
- than '#'.
181
-
182
-
183
-* jn/maint-trim-vim-contrib (2013-01-10) 1 commit
184
- - contrib/vim: simplify instructions for old vim support
185
-
186
- Will merge to 'next'.
187
-
188
-
189
-* mz/reset-misc (2013-01-10) 22 commits
190
- - reset [--mixed]: use diff-based reset whether or not pathspec was given
191
- - [SQUASH???] script portability fixes
192
- - reset: allow reset on unborn branch
193
- - reset $sha1 $pathspec: require $sha1 only to be treeish
194
- - reset [--mixed] --quiet: don't refresh index
195
- - reset.c: finish entire cmd_reset() whether or not pathspec is given
196
- - reset [--mixed]: don't write index file twice
197
- - reset.c: move lock, write and commit out of update_index_refresh()
198
- - reset.c: move update_index_refresh() call out of read_from_tree()
199
- - reset: avoid redundant error message
200
- - reset --keep: only write index file once
201
- - reset.c: replace switch by if-else
202
- - reset.c: share call to die_if_unmerged_cache()
203
- - [SQUASH???] style fixes
204
- - reset.c: extract function for updating {ORIG,}HEAD
205
- - reset.c: remove unnecessary variable 'i'
206
- - [SQUASH???] style fix
207
- - reset.c: extract function for parsing arguments
208
- - reset: don't allow "git reset -- $pathspec" in bare repo
209
- - reset.c: pass pathspec around instead of (prefix, argv) pair
210
- - reset $pathspec: exit with code 0 if successful
211
- - reset $pathspec: no need to discard index
181
213
- Various 'reset' optimizations and clean-ups, followed by a change
214
- to allow "git reset" to work even on an unborn branch.
182
+* jk/unify-exit-code-by-receiving-signal (2013-01-06) 1 commit
183
+ (merged to 'next' on 2013-01-08 at 5ebf940)
184
+ + run-command: encode signal death as a positive integer
185
186
+ The internal logic had to deal with two representations of a death
187
+ of a child process by a signal.
188
217
-* pe/doc-email-env-is-trumped-by-config (2013-01-10) 1 commit
218
- - git-commit-tree(1): correct description of defaults
189
220
- In the precedence order, the environment variable $EMAIL comes
221
- between the built-in default (i.e. taking value by asking the
222
- system's gethostname() etc.) and the user.email configuration
223
- variable; the documentation implied that it is stronger than the
224
- configuration like $GIT_COMMITTER_EMAIL is, which is wrong.
190
+* jn/xml-depends-on-asciidoc-conf (2013-01-06) 1 commit
191
+ (merged to 'next' on 2013-01-08 at 4faf8d4)
192
+ + docs: manpage XML depends on asciidoc.conf
193
226
- Will merge to 'next'.
194
195
+* nd/upload-pack-shallow-must-be-commit (2013-01-08) 1 commit
196
+ (merged to 'next' on 2013-01-10 at a8b3ba5)
197
+ + upload-pack: only accept commits from "shallow" line
198
229
-* ds/completion-silence-in-tree-path-probe (2013-01-11) 1 commit
230
- - git-completion.bash: silence "not a valid object" errors
199
+ A minor consistency check patch that does not have much relevance
200
+ to the real world.
201
232
- An internal ls-tree call made by completion code only to probe if
233
- a path exists in the tree recorded in a commit object leaked error
234
- messages when the path is not there. It is not an error at all and
235
- should not be shown to the end user.
202
237
- Will merge to 'next'.
203
+* nz/send-email-headers-are-case-insensitive (2013-01-06) 1 commit
204
+ (merged to 'next' on 2013-01-10 at cf4c9c9)
205
+ + git-send-email: treat field names as case-insensitively
206
207
+ When user spells "cc:" in lowercase in the fake "header" in the
208
+ trailer part, send-email failed to pick up the addresses from
209
+ there. As e-mail headers field names are case insensitive, this
210
+ script should follow suit and treat "cc:" and "Cc:" the same way.
211
240
-* er/replace-cvsimport (2013-01-11) 4 commits
241
- - t9604: fixup for new cvsimport
242
- - t9600: fixup for new cvsimport
243
- - t/lib-cvs.sh: allow cvsps version 3.x.
244
- - cvsimport: rewrite to use cvsps 3.x to fix major bugs
212
246
- Rewrite of cvsimport to talk with cvsps 3.x; this negatively
247
- affects existing users of cvsimport that only have cvsps 2.x and
248
- use -o, -M and -m options (they cannot use the old cvsimport with
249
- old cvsps 2.x in the fall-back mode, even though these options are
250
- supported by the old one), but it is not known how common they are.
213
+* rs/zip-tests (2013-01-07) 4 commits
214
+ (merged to 'next' on 2013-01-08 at 8e37423)
215
+ + t5003: check if unzip supports symlinks
216
+ + t5000, t5003: move ZIP tests into their own script
217
+ + t0024, t5000: use test_lazy_prereq for UNZIP
218
+ + t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
219
252
- For people who work with complex CVS histories that needs cvsps 3.x
253
- to import correctly, this version should be a definite improvement,
254
- so I would love to see small wrinkles in the new implementation
255
- straightened out. Help from people with Python experience would be
256
- appreciated in reviewing and patching.
220
+ Updates zip tests to skip some that cannot be handled on platform
221
+ unzip.
222
223
259
-* nd/fetch-depth-is-broken (2013-01-11) 3 commits
260
- - fetch: elaborate --depth action
261
- - upload-pack: fix off-by-one depth calculation in shallow clone
262
- - fetch: add --unshallow for turning shallow repo into complete one
224
+* rs/zip-with-uncompressed-size-in-the-header (2013-01-06) 1 commit
225
+ (merged to 'next' on 2013-01-08 at d9ec30e)
226
+ + archive-zip: write uncompressed size into header even with streaming
227
264
- "git fetch --depth" was broken in at least three ways. The
265
- resulting history was deeper than specified by one commit, it was
266
- unclear how to wipe the shallowness of the repository with the
267
- command, and documentation was misleading.
228
+ Improve compatibility of our zip output to fill uncompressed size
229
+ in the header, which we can do without seeking back (even though it
230
+ should not be necessary).
231
269
- Will merge to 'next'.
232
+--------------------------------------------------
233
+[Stalled]
234
235
+* mp/complete-paths (2013-01-11) 1 commit
236
+ - git-completion.bash: add support for path completion
237
272
-* jc/no-git-config-in-clone (2013-01-11) 1 commit
273
- - clone: do not export and unexport GIT_CONFIG
238
+ The completion script used to let the default completer to suggest
239
+ pathnames, which gave too many irrelevant choices (e.g. "git add"
240
+ would not want to add an unmodified path). Teach it to use a more
241
+ git-aware logic to enumerate only relevant ones.
242
275
- We stopped paying attention to $GIT_CONFIG environment that points
276
- at a single configuration file from any command other than "git config"
277
- quite a while ago, but "git clone" internally set, exported, and
278
- then unexported the variable during its operation unnecessarily.
243
+ Waiting for area-experts' help and review.
244
280
---------------------------------------------------
281
-[Stalled]
245
246
* jl/submodule-deinit (2012-12-04) 1 commit
247
- submodule: add 'deinit' command
@@ -377,14 +340,99 @@ repositories listed at
340
--------------------------------------------------
341
[Cooking]
342
380
-* nz/send-email-headers-are-case-insensitive (2013-01-06) 1 commit
381
- (merged to 'next' on 2013-01-10 at cf4c9c9)
382
- + git-send-email: treat field names as case-insensitively
343
+* rt/commit-cleanup-config (2013-01-10) 1 commit
344
+ - commit: make default of "cleanup" option configurable
345
384
- When user spells "cc:" in lowercase in the fake "header" in the
385
- trailer part, send-email failed to pick up the addresses from
386
- there. As e-mail headers field names are case insensitive, this
387
- script should follow suit and treat "cc:" and "Cc:" the same way.
346
+ Add a configuration variable to set default clean-up mode other
347
+ than "strip".
348
+
349
+ Will merge to 'next'.
350
+
351
+
352
+* jc/custom-comment-char (2013-01-10) 1 commit
353
+ - Allow custom "comment char"
354
+
355
+ An illustration to show codepaths that need to be touched to change
356
+ the hint lines in the edited text to begin with something other
357
+ than '#'.
358
+
359
+
360
+* jn/maint-trim-vim-contrib (2013-01-10) 1 commit
361
+ - contrib/vim: simplify instructions for old vim support
362
+
363
+ Will merge to 'next'.
364
+
365
+
366
+* mz/reset-misc (2013-01-10) 22 commits
367
+ - reset [--mixed]: use diff-based reset whether or not pathspec was given
368
+ - [SQUASH???] script portability fixes
369
+ - reset: allow reset on unborn branch
370
+ - reset $sha1 $pathspec: require $sha1 only to be treeish
371
+ - reset [--mixed] --quiet: don't refresh index
372
+ - reset.c: finish entire cmd_reset() whether or not pathspec is given
373
+ - reset [--mixed]: don't write index file twice
374
+ - reset.c: move lock, write and commit out of update_index_refresh()
375
+ - reset.c: move update_index_refresh() call out of read_from_tree()
376
+ - reset: avoid redundant error message
377
+ - reset --keep: only write index file once
378
+ - reset.c: replace switch by if-else
379
+ - reset.c: share call to die_if_unmerged_cache()
380
+ - [SQUASH???] style fixes
381
+ - reset.c: extract function for updating {ORIG,}HEAD
382
+ - reset.c: remove unnecessary variable 'i'
383
+ - [SQUASH???] style fix
384
+ - reset.c: extract function for parsing arguments
385
+ - reset: don't allow "git reset -- $pathspec" in bare repo
386
+ - reset.c: pass pathspec around instead of (prefix, argv) pair
387
+ - reset $pathspec: exit with code 0 if successful
388
+ - reset $pathspec: no need to discard index
389
+
390
+ Various 'reset' optimizations and clean-ups, followed by a change
391
+ to allow "git reset" to work even on an unborn branch.
392
+
393
+
394
+* pe/doc-email-env-is-trumped-by-config (2013-01-10) 1 commit
395
+ (merged to 'next' on 2013-01-14 at 6b4d555)
396
+ + git-commit-tree(1): correct description of defaults
397
+
398
+ In the precedence order, the environment variable $EMAIL comes
399
+ between the built-in default (i.e. taking value by asking the
400
+ system's gethostname() etc.) and the user.email configuration
401
+ variable; the documentation implied that it is stronger than the
402
+ configuration like $GIT_COMMITTER_EMAIL is, which is wrong.
403
+
404
+
405
+* ds/completion-silence-in-tree-path-probe (2013-01-11) 1 commit
406
+ - git-completion.bash: silence "not a valid object" errors
407
+
408
+ An internal ls-tree call made by completion code only to probe if
409
+ a path exists in the tree recorded in a commit object leaked error
410
+ messages when the path is not there. It is not an error at all and
411
+ should not be shown to the end user.
412
+
413
+ Will merge to 'next'.
414
+
415
+
416
+* nd/fetch-depth-is-broken (2013-01-11) 3 commits
417
+ - fetch: elaborate --depth action
418
+ - upload-pack: fix off-by-one depth calculation in shallow clone
419
+ - fetch: add --unshallow for turning shallow repo into complete one
420
+
421
+ "git fetch --depth" was broken in at least three ways. The
422
+ resulting history was deeper than specified by one commit, it was
423
+ unclear how to wipe the shallowness of the repository with the
424
+ command, and documentation was misleading.
425
+
426
+ Will merge to 'next'.
427
+
428
+
429
+* jc/no-git-config-in-clone (2013-01-11) 1 commit
430
+ - clone: do not export and unexport GIT_CONFIG
431
+
432
+ We stopped paying attention to $GIT_CONFIG environment that points
433
+ at a single configuration file from any command other than "git config"
434
+ quite a while ago, but "git clone" internally set, exported, and
435
+ then unexported the variable during its operation unnecessarily.
436
437
438
* mk/complete-tcsh (2013-01-07) 1 commit
@@ -406,7 +454,7 @@ repositories listed at
454
455
contrib/subtree updates.
456
409
- Will merge to 'next'.
457
+ Rerolled?
458
459
460
* ap/log-mailmap (2013-01-10) 11 commits
@@ -427,23 +475,6 @@ repositories listed at
475
the mailmap.
476
477
430
-* nd/upload-pack-shallow-must-be-commit (2013-01-08) 1 commit
431
- (merged to 'next' on 2013-01-10 at a8b3ba5)
432
- + upload-pack: only accept commits from "shallow" line
433
-
434
- A minor consistency check patch that does not have much relevance
435
- to the real world.
436
-
437
-
438
-* jc/blame-no-follow (2012-09-21) 2 commits
439
- (merged to 'next' on 2013-01-10 at 201c7f4)
440
- + blame: pay attention to --no-follow
441
- + diff: accept --no-follow option
442
-
443
- Teaches "--no-follow" option to "git blame" to disable its
444
- whole-file rename detection.
445
-
446
-
478
* jc/push-2.0-default-to-simple (2013-01-08) 11 commits
479
(merged to 'next' on 2013-01-09 at 74c3498)
480
+ doc: push.default is no longer "matching"
@@ -461,23 +492,6 @@ repositories listed at
492
Will cook in 'next' until Git 2.0 ;-).
493
494
464
-* jk/unify-exit-code-by-receiving-signal (2013-01-06) 1 commit
465
- (merged to 'next' on 2013-01-08 at 5ebf940)
466
- + run-command: encode signal death as a positive integer
467
-
468
- The internal logic had to deal with two representations of a death
469
- of a child process by a signal.
470
-
471
- Will merge to 'master'.
472
-
473
-
474
-* jn/xml-depends-on-asciidoc-conf (2013-01-06) 1 commit
475
- (merged to 'next' on 2013-01-08 at 4faf8d4)
476
- + docs: manpage XML depends on asciidoc.conf
477
-
478
- Will merge to 'master'.
479
-
480
-
495
* nd/clone-no-separate-git-dir-with-bare (2013-01-10) 1 commit
496
- clone: forbid --bare --separate-git-dir <dir>
497
@@ -485,59 +499,32 @@ repositories listed at
499
500
501
* nd/parse-pathspec (2013-01-11) 20 commits
488
- - Convert more init_pathspec() to parse_pathspec()
489
- - Convert add_files_to_cache to take struct pathspec
490
- - Convert {read,fill}_directory to take struct pathspec
491
- - Convert refresh_index to take struct pathspec
492
- - Convert report_path_error to take struct pathspec
493
- - checkout: convert read_tree_some to take struct pathspec
494
- - Convert unmerge_cache to take struct pathspec
495
- - Convert read_cache_preload() to take struct pathspec
496
- - add: convert to use parse_pathspec
497
- - archive: convert to use parse_pathspec
498
- - ls-files: convert to use parse_pathspec
499
- - rm: convert to use parse_pathspec
500
- - checkout: convert to use parse_pathspec
501
- - rerere: convert to use parse_pathspec
502
- - status: convert to use parse_pathspec
503
- - commit: convert to use parse_pathspec
504
- - clean: convert to use parse_pathspec
505
- - Export parse_pathspec() and convert some get_pathspec() calls
506
- - Add parse_pathspec() that converts cmdline args to struct pathspec
507
- - pathspec: save the non-wildcard length part
502
+ . Convert more init_pathspec() to parse_pathspec()
503
+ . Convert add_files_to_cache to take struct pathspec
504
+ . Convert {read,fill}_directory to take struct pathspec
505
+ . Convert refresh_index to take struct pathspec
506
+ . Convert report_path_error to take struct pathspec
507
+ . checkout: convert read_tree_some to take struct pathspec
508
+ . Convert unmerge_cache to take struct pathspec
509
+ . Convert read_cache_preload() to take struct pathspec
510
+ . add: convert to use parse_pathspec
511
+ . archive: convert to use parse_pathspec
512
+ . ls-files: convert to use parse_pathspec
513
+ . rm: convert to use parse_pathspec
514
+ . checkout: convert to use parse_pathspec
515
+ . rerere: convert to use parse_pathspec
516
+ . status: convert to use parse_pathspec
517
+ . commit: convert to use parse_pathspec
518
+ . clean: convert to use parse_pathspec
519
+ . Export parse_pathspec() and convert some get_pathspec() calls
520
+ . Add parse_pathspec() that converts cmdline args to struct pathspec
521
+ . pathspec: save the non-wildcard length part
522
523
Uses the parsed pathspec structure in more places where we used to
524
use the raw "array of strings" pathspec.
525
512
- Unfortunately, this conflicts a couple of topics in flight. I tried
513
- to be careful while resolving conflicts, though.
514
-
515
-
516
-* rs/zip-tests (2013-01-07) 4 commits
517
- (merged to 'next' on 2013-01-08 at 8e37423)
518
- + t5003: check if unzip supports symlinks
519
- + t5000, t5003: move ZIP tests into their own script
520
- + t0024, t5000: use test_lazy_prereq for UNZIP
521
- + t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
522
-
523
- Updates zip tests to skip some that cannot be handled on platform
524
- unzip.
525
-
526
- I've renamed the t5002 in the original to t5003 to avoid name
527
- clashes with another topic in flight.
528
-
529
- Will merge to 'master'.
530
-
531
-
532
-* rs/zip-with-uncompressed-size-in-the-header (2013-01-06) 1 commit
533
- (merged to 'next' on 2013-01-08 at d9ec30e)
534
- + archive-zip: write uncompressed size into header even with streaming
535
-
536
- Improve compatibility of our zip output to fill uncompressed size
537
- in the header, which we can do without seeking back (even though it
538
- should not be necessary).
539
-
540
- Will merge to 'master'.
526
+ Ejected from 'pu' for now; will take a look at the rerolled one
527
+ later ($gmane/213340).
528
529
530
* jc/doc-maintainer (2013-01-03) 2 commits
@@ -549,17 +536,6 @@ repositories listed at
536
document was originally written.
537
538
552
-* fc/remote-testgit-feature-done (2012-10-29) 1 commit
553
- (merged to 'next' on 2013-01-10 at 3132a60)
554
- + remote-testgit: properly check for errors
555
-
556
- In the longer term, tightening rules is a good thing to do, and
557
- because nobody who has worked in the remote helper area seems to be
558
- interested in reviewing this, I would assume they do not think
559
- such a retroactive tightening will affect their remote helpers. So
560
- let's advance this topic to see what happens.
561
-
562
-
539
* mo/cvs-server-updates (2012-12-09) 18 commits
540
(merged to 'next' on 2013-01-08 at 75e2d11)
541
+ t9402: Use TABs for indentation
@@ -586,57 +562,24 @@ repositories listed at
562
Will cook in 'next' for a while to see if anybody screams.
563
564
589
-* ap/status-ignored-in-ignored-directory (2013-01-07) 3 commits
590
- (merged to 'next' on 2013-01-10 at 20f7476)
591
- + status: always report ignored tracked directories
592
- (merged to 'next' on 2013-01-07 at 2a20b19)
593
- + git-status: Test --ignored behavior
594
- + dir.c: Make git-status --ignored more consistent
595
-
596
- Output from "git status --ignored" showed an unexpected interaction
597
- with "--untracked".
598
-
599
-
565
* as/check-ignore (2013-01-10) 12 commits
601
- - t0008: avoid brace expansion
602
- - add git-check-ignore sub-command
603
- - setup.c: document get_pathspec()
604
- - add.c: extract new die_if_path_beyond_symlink() for reuse
605
- - add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse
606
- - pathspec.c: rename newly public functions for clarity
607
- - add.c: move pathspec matchers into new pathspec.c for reuse
608
- - add.c: remove unused argument from validate_pathspec()
609
- - dir.c: improve docs for match_pathspec() and match_pathspec_depth()
610
- - dir.c: provide clear_directory() for reclaiming dir_struct memory
611
- - dir.c: keep track of where patterns came from
612
- - dir.c: use a single struct exclude_list per source of excludes
566
+ (merged to 'next' on 2013-01-14 at 9df2afc)
567
+ + t0008: avoid brace expansion
568
+ + add git-check-ignore sub-command
569
+ + setup.c: document get_pathspec()
570
+ + add.c: extract new die_if_path_beyond_symlink() for reuse
571
+ + add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse
572
+ + pathspec.c: rename newly public functions for clarity
573
+ + add.c: move pathspec matchers into new pathspec.c for reuse
574
+ + add.c: remove unused argument from validate_pathspec()
575
+ + dir.c: improve docs for match_pathspec() and match_pathspec_depth()
576
+ + dir.c: provide clear_directory() for reclaiming dir_struct memory
577
+ + dir.c: keep track of where patterns came from
578
+ + dir.c: use a single struct exclude_list per source of excludes
579
580
Add a new command "git check-ignore" for debugging .gitignore
581
files.
582
617
- Will merge to 'next'.
618
-
619
-
620
-* jc/format-patch-reroll (2013-01-03) 9 commits
621
- (merged to 'next' on 2013-01-07 at 0e007e6)
622
- + format-patch: give --reroll-count a short synonym -v
623
- + format-patch: document and test --reroll-count
624
- + format-patch: add --reroll-count=$N option
625
- + get_patch_filename(): split into two functions
626
- + get_patch_filename(): drop "just-numbers" hack
627
- + get_patch_filename(): simplify function signature
628
- + builtin/log.c: stop using global patch_suffix
629
- + builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()
630
- + builtin/log.c: drop unused "numbered" parameter from make_cover_letter()
631
-
632
- Originally merged to 'next' on 2013-01-04
633
-
634
- Teach "format-patch" to prefix v4- to its output files for the
635
- fourth iteration of a patch series, to make it easier for the
636
- submitter to keep separate copies for iterations.
637
-
638
- Will merge to 'master'.
639
-
583
584
* nd/retire-fnmatch (2013-01-01) 7 commits
585
(merged to 'next' on 2013-01-07 at ab31f9b)
@@ -657,19 +600,6 @@ repositories listed at
600
Will cook in 'next' a bit longer than other topics.
601
602
660
-* jc/merge-blobs (2012-12-26) 5 commits
661
- (merged to 'next' on 2013-01-08 at 582ca38)
662
- + merge-tree: fix d/f conflicts
663
- + merge-tree: add comments to clarify what these functions are doing
664
- + merge-tree: lose unused "resolve_directories"
665
- + merge-tree: lose unused "flags" from merge_list
666
- + Which merge_file() function do you mean?
667
-
668
- Update the disused merge-tree proof-of-concept code.
669
-
670
- Will merge to 'master'.
671
-
672
-
603
* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
604
- Highlight the link target line in Gitweb using CSS
605
@@ -677,8 +607,7 @@ repositories listed at
607
$gmane/211935
608
609
680
-* zk/clean-report-failure (2013-01-10) 2 commits
681
- - [SQUASH???] style fixes
610
+* zk/clean-report-failure (2013-01-14) 1 commit
611
- git-clean: Display more accurate delete messages
612
613
"git clean" states what it is going to remove and then goes on to
@@ -686,18 +615,7 @@ repositories listed at
615
removed after recursing into a directory, which makes the output
616
confusing and even wrong.
617
689
- Will merge to 'next' after squashing the style fix in.
690
-
691
-
692
-* mp/complete-paths (2013-01-11) 1 commit
693
- - git-completion.bash: add support for path completion
694
-
695
- The completion script used to let the default completer to suggest
696
- pathnames, which gave too many irrelevant choices (e.g. "git add"
697
- would not want to add an unmodified path). Teach it to use a more
698
- git-aware logic to enumerate only relevant ones.
699
-
700
- Waiting for area-experts' help and review.
618
+ Will merge to 'next'.
619
620
621
* bc/append-signed-off-by (2013-01-01) 12 commits
@@ -716,3 +634,17 @@ repositories listed at
634
635
Expecting a reroll.
636
$gmane/212507
637
+
638
+--------------------------------------------------
639
+[Discarded]
640
+
641
+* er/replace-cvsimport (2013-01-12) 7 commits
642
+ . t/lib-cvs: cvsimport no longer works without Python >= 2.7
643
+ . t9605: test for cvsps commit ordering bug
644
+ . t9604: fixup for new cvsimport
645
+ . t9600: fixup for new cvsimport
646
+ . t/lib-cvs.sh: allow cvsps version 3.x.
647
+ . t/t960[123]: remove leftover scripts
648
+ . cvsimport: rewrite to use cvsps 3.x to fix major bugs
649
+
650
+ Rerolled as jc/cvsimport-upgrade.