What's cooking (2013/01 #05)
Junio C Hamano committed
Jan 11, 2013 at 15:50 UTC
b74cb9f9b736a201939b7043f0ee84d3331a0ec4
1 file changed
+263
-380
whats-cooking.txt
+263
-380
@@ -1,22 +1,16 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2013, #04; Wed, 9)
4
-X-master-at: 44fe83502edf5391bb3a5997cab01794b4568062
5
-X-next-at: ffbe6f75280588398438a571a8a937328d87c3a3
3
+Subject: What's cooking in git.git (Jan 2013, #05; Fri, 11)
4
+X-master-at: a27d83aee906a767ae12dc39cd0aa5b42448bd6c
5
+X-next-at: b8b30b1c3494e2bbefedcefe98fd2bab94927a80
6
7
-What's cooking in git.git (Jan 2013, #04; Wed, 9)
7
+What's cooking in git.git (Jan 2013, #05; Fri, 11)
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
-So far, about 60 topics, most of which have been cooking since the
15
-previous cycle, have been graduated to the 'master' branch in
16
-preparation for the next release, which tentatively is called 1.8.2.
17
-Many of these early topics are bugfixes and expected to later land
18
-in the 'maint' branch for 1.8.1.1 release as well.
19
-
14
As usual, this cycle is expected to last for 8 to 10 weeks, with a
15
preview -rc0 sometime in the middle of next month.
16
@@ -26,274 +20,262 @@ repositories listed at
20
http://git-blame.blogspot.com/p/git-public-repositories.html
21
22
--------------------------------------------------
29
-[New Topics]
30
-
31
-* nz/send-email-headers-are-case-insensitive (2013-01-06) 1 commit
32
- - git-send-email: treat field names as case-insensitively
33
-
34
- When user spells "cc:" in lowercase in the fake "header" in the
35
- trailer part, send-email failed to pick up the addresses from
36
- there. As e-mail headers field names are case insensitive, this
37
- script should follow suit and treat "cc:" and "Cc:" the same way.
38
-
39
- Will merge to 'next'.
40
-
41
-
42
-* mk/complete-tcsh (2013-01-07) 1 commit
43
- - Prevent space after directories in tcsh completion
44
-
45
- Update tcsh command line completion so that an unwanted space is
46
- not added to a single directory name.
47
-
48
- Will merge to 'next'.
49
-
50
-
51
-* dg/subtree-fixes (2013-01-08) 7 commits
52
- - contrib/subtree: mkdir the manual directory if needed
53
- - contrib/subtree: honor $(DESTDIR)
54
- - contrib/subtree: fix synopsis and command help
55
- - contrib/subtree: better error handling for "add"
56
- - contrib/subtree: add --unannotate option
57
- - contrib/subtree: use %B for split Subject/Body
58
- - t7900: remove test number comments
59
-
60
- contrib/subtree updates.
61
-
62
- Will merge to 'next'.
63
-
64
-
65
-* ap/log-mailmap (2013-01-08) 11 commits
66
- - log --use-mailmap: optimize for cases without --author/--committer search
67
- - log: add log.mailmap configuration option
68
- - log: grep author/committer using mailmap
69
- - test: add test for --use-mailmap option
70
- - log: add --use-mailmap option
71
- - pretty: use mailmap to display username and email
72
- - mailmap: add mailmap structure to rev_info and pp
73
- - mailmap: simplify map_user() interface
74
- - mailmap: remove email copy and length limitation
75
- - Use split_ident_line to parse author and committer
76
- - string-list: allow case-insensitive string list
23
+[Graduated to "master"]
24
78
- Teach commands in the "log" family to optionally pay attention to
79
- the mailmap.
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
81
- Will merge to 'next'.
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
84
-* nd/upload-pack-shallow-must-be-commit (2013-01-08) 1 commit
85
- - upload-pack: only accept commits from "shallow" line
44
+ Refactor and generally clean up the directory traversal API
45
+ implementation.
46
87
- A minor consistency check patch that does not have much relevance
88
- to the real world.
47
90
- Will merge to 'next'.
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
51
92
---------------------------------------------------
93
-[Graduated to "master"]
52
+ Originally merged to 'next' on 2013-01-02
53
95
-* ap/merge-stop-at-prepare-commit-msg-failure (2013-01-03) 1 commit
96
- (merged to 'next' on 2013-01-07 at 6790566)
97
- + merge: Honor prepare-commit-msg return code
54
+ Save output from format-patch command in a temporary file, just in
55
+ case it aborts, to give a better failure-case behaviour.
56
99
- Originally merged to 'next' on 2013-01-04
57
101
- "git merge" started calling prepare-commit-msg hook like "git
102
- commit" does some time ago, but forgot to pay attention to the exit
103
- status of the hook. t7505 may want a general clean-up but that is
104
- a different topic.
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
61
62
107
-* as/test-name-alias-uniquely (2012-12-28) 1 commit
108
- (merged to 'next' on 2013-01-07 at 3b11c25)
109
- + Use longer alias names in subdirectory tests
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
66
67
Originally merged to 'next' on 2013-01-02
68
113
- A few short-and-bland aliases used in the tests were interfering
114
- with git-custom command in user's $PATH.
115
-
69
+ Stop spending cycles to compute information to be placed on
70
+ commented lines in "merge --no-edit".
71
117
-* cc/no-gitk-build-dependency (2012-12-18) 3 commits
118
- + Makefile: replace "echo 1>..." with "echo >..."
119
- + Makefile: detect when PYTHON_PATH changes
120
- + Makefile: remove tracking of TCLTK_PATH
72
122
- Remove leftover bits from an earlier change to move gitk in its own
123
- subdirectory. Reimplementing the dependency tracking rules needs
124
- to be done in gitk history separately.
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
76
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.
80
127
-* er/python-version-requirements (2012-12-28) 1 commit
128
- (merged to 'next' on 2013-01-07 at 4954e27)
129
- + Add checks to Python scripts for version dependencies.
81
131
- Originally merged to 'next' on 2013-01-02
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
85
133
- Some python scripts we ship cannot be run with old versions of the
134
- interpreter.
86
+ When "git clone --separate-git-dir" is interrupted, we failed to
87
+ remove the real location we created the repository.
88
89
137
-* er/stop-recommending-parsecvs (2012-12-28) 1 commit
138
- (merged to 'next' on 2013-01-07 at 689f28f)
139
- + Remove the suggestion to use parsecvs, which is currently broken.
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
94
95
Originally merged to 'next' on 2013-01-02
96
143
- Stop recommending a defunct third-party software.
144
-
145
-
146
-* fc/remote-bzr (2013-01-02) 9 commits
147
- (merged to 'next' on 2013-01-07 at f8c0b76)
148
- + remote-bzr: detect local repositories
149
- + remote-bzr: add support for older versions of bzr
150
- + remote-bzr: add support to push special modes
151
- + remote-bzr: add support for fecthing special modes
152
- + remote-bzr: add simple tests
153
- + remote-bzr: update working tree upon pushing
154
- + remote-bzr: add support for remote repositories
155
- + remote-bzr: add support for pushing
156
- + Add new remote-bzr transport helper
157
-
158
- Originally merged to 'next' on 2013-01-04
159
-
160
- New remote helper for bzr, with minimum fix squashed in.
97
+ Allows "git cherry-pick $commit" when you do not have any history
98
+ behind HEAD yet.
99
100
163
-* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
164
- + apply.c:update_pre_post_images(): the preimage can be truncated
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.)
122
166
- Fix to update_pre_post_images() that did not take into account the
167
- possibility that whitespace fix could shrink the preimage and
168
- change the number of lines in it.
123
+ Originally merged to 'next' on 2013-01-01
124
125
+ Allows pathname patterns in .gitignore and .gitattributes files
126
+ with double-asterisks "foo/**/bar" to match any number of directory
127
+ hierarchies.
128
171
-* jc/submittingpatches (2013-01-02) 4 commits
172
- (merged to 'next' on 2013-01-07 at 1cc3b8e)
173
- + SubmittingPatches: give list and maintainer addresses
174
- + SubmittingPatches: remove overlong checklist
175
- + SubmittingPatches: mention subsystems with dedicated repositories
176
- + SubmittingPatches: who am I and who cares?
129
178
- Originally merged to 'next' on 2013-01-04
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
133
180
- Streamline the document and update with a few e-mail addresses the
181
- patches should be sent to.
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).
137
138
184
-* jk/enable-test-lint-by-default (2013-01-03) 1 commit
185
- (merged to 'next' on 2013-01-07 at 2a77155)
186
- + tests: turn on test-lint by default
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
142
143
Originally merged to 'next' on 2013-01-04
144
190
- We had two simple and quick tests to catch common mistakes when
191
- writing test scripts, but they weren't run by default when running
192
- tests.
193
-
194
-
195
-* jk/maint-fast-import-doc-dedup-done (2013-01-07) 1 commit
196
- (merged to 'next' on 2013-01-07 at af6a054)
197
- + git-fast-import(1): remove duplicate '--done' option
198
-
199
- The "logical order" reorganization can come after that is done and
200
- can cook longer in 'next'.
201
-
202
-
203
-* jk/pathspec-literal (2013-01-06) 1 commit
204
- (merged to 'next' on 2013-01-07 at f0725cc)
205
- + t6130-pathspec-noglob: Windows does not allow a file named "f*"
145
+ Check for common mistakes in the test scripts, based on simple
146
+ pattern-matching.
147
207
- Finishing touches to unbreak a test on Windows.
148
+--------------------------------------------------
149
+[New Topics]
150
151
+* jk/maint-fast-import-doc-reorder (2013-01-09) 2 commits
152
+ (merged to 'next' on 2013-01-10 at 9f3950d)
153
+ + git-fast-import(1): reorganise options
154
+ + git-fast-import(1): combine documentation of --[no-]relative-marks
155
210
-* jn/less-reconfigure (2013-01-02) 1 commit
211
- (merged to 'next' on 2013-01-07 at 04c11cb)
212
- + build: do not automatically reconfigure unless configure.ac changed
156
+ Will merge to 'master'.
157
214
- Originally merged to 'next' on 2013-01-02
158
216
- When autoconf is used, any build on a different commit always ran
217
- "config.status --recheck" even when unnecessary.
159
+* jk/shortlog-no-wrap-doc (2013-01-09) 1 commit
160
+ (merged to 'next' on 2013-01-10 at c79898a)
161
+ + git-shortlog(1): document behaviour of zero-width wrap
162
163
+ Will merge to 'master'.
164
220
-* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits
221
- + config: exit on error accessing any config file
222
- + doc: advertise GIT_CONFIG_NOSYSTEM
223
- + config: treat user and xdg config permission problems as errors
224
- + config, gitignore: failure to access with ENOTDIR is ok
165
226
- Deal with a situation where .config/git is a file and we notice
227
- .config/git/config is not readable due to ENOTDIR, not ENOENT.
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
230
-* kb/maint-bundle-doc (2013-01-01) 2 commits
231
- (merged to 'next' on 2013-01-07 at 3d2b1ea)
232
- + Documentation: full-ness of a bundle is significant for cloning
233
- + Documentation: correct example restore from bundle
172
+ Will merge to 'next'.
173
235
- Originally merged to 'next' on 2013-01-04
174
237
- Update an example in the "git bundle" documentation.
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
240
-* mz/oneway-merge-wo-u-no-lstat (2012-12-20) 1 commit
241
- + oneway_merge(): only lstat() when told to update worktree
182
243
- Optimize "read-tree -m <tree-ish>" without "-u".
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
246
-* nd/maint-branch-desc-doc (2013-01-03) 5 commits
247
- (merged to 'next' on 2013-01-07 at 5117679)
248
- + format-patch: pick up branch description when no ref is specified
249
- + format-patch: pick up correct branch name from symbolic ref
250
- + t4014: a few more tests on cover letter using branch description
251
- + branch: delete branch description if it's empty
252
- + config.txt: a few lines about branch.<name>.description
188
254
- Originally merged to 'next' on 2013-01-04
255
-
256
- Teach various forms of "format-patch" command line to identify what
257
- branch the patches are taken from, so that the branch description
258
- is picked up in more cases.
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
212
+
213
+ Various 'reset' optimizations and clean-ups, followed by a change
214
+ to allow "git reset" to work even on an unborn branch.
215
+
216
+
217
+* pe/doc-email-env-is-trumped-by-config (2013-01-10) 1 commit
218
+ - git-commit-tree(1): correct description of defaults
219
+
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.
225
226
+ Will merge to 'next'.
227
261
-* os/gitweb-highlight-uncaptured (2013-01-01) 1 commit
262
- (merged to 'next' on 2013-01-07 at 5db0558)
263
- + gitweb: fix error in sanitize when highlight is enabled
228
265
- Originally merged to 'next' on 2013-01-04
229
+* ds/completion-silence-in-tree-path-probe (2013-01-11) 1 commit
230
+ - git-completion.bash: silence "not a valid object" errors
231
267
- The code to sanitize control characters before passing it to
268
- "highlight" filter lost known-to-be-safe control characters by
269
- mistake.
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.
236
237
+ Will merge to 'next'.
238
272
-* ta/remove-stale-translated-tut (2012-12-27) 1 commit
273
- (merged to 'next' on 2013-01-07 at 47b1056)
274
- + Remove Documentation/pt_BR/gittutorial.txt
239
276
- Originally merged to 'next' on 2013-01-02
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
245
278
- Remove a translation of a document that was left stale.
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.
251
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.
257
281
-* tb/test-t9020-no-which (2013-01-01) 1 commit
282
- (merged to 'next' on 2013-01-07 at 9661948)
283
- + t9020: which is not portable
258
285
- Originally merged to 'next' on 2013-01-04
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
263
287
- Test portability update.
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.
268
269
+ Will merge to 'next'.
270
290
-* tb/test-t9810-no-sed-i (2013-01-01) 1 commit
291
- (merged to 'next' on 2013-01-07 at cd82266)
292
- + t9810: Do not use sed -i
271
294
- Originally merged to 'next' on 2013-01-04
272
+* jc/no-git-config-in-clone (2013-01-11) 1 commit
273
+ - clone: do not export and unexport GIT_CONFIG
274
296
- Test portability update.
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.
279
280
--------------------------------------------------
281
[Stalled]
@@ -395,45 +377,71 @@ repositories listed at
377
--------------------------------------------------
378
[Cooking]
379
398
-* jc/blame-no-follow (2012-09-21) 2 commits
399
- - blame: pay attention to --no-follow
400
- - diff: accept --no-follow option
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
383
402
- Teaches "--no-follow" option to "git blame" to disable its
403
- whole-file rename detection.
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.
388
+
389
+
390
+* mk/complete-tcsh (2013-01-07) 1 commit
391
+ (merged to 'next' on 2013-01-11 at b8b30b1)
392
+ + Prevent space after directories in tcsh completion
393
+
394
+ Update tcsh command line completion so that an unwanted space is
395
+ not added to a single directory name.
396
+
397
+
398
+* dg/subtree-fixes (2013-01-08) 7 commits
399
+ - contrib/subtree: mkdir the manual directory if needed
400
+ - contrib/subtree: honor $(DESTDIR)
401
+ - contrib/subtree: fix synopsis and command help
402
+ - contrib/subtree: better error handling for "add"
403
+ - contrib/subtree: add --unannotate option
404
+ - contrib/subtree: use %B for split Subject/Body
405
+ - t7900: remove test number comments
406
+
407
+ contrib/subtree updates.
408
409
Will merge to 'next'.
410
411
408
-* as/dir-c-cleanup (2012-12-28) 10 commits
409
- (merged to 'next' on 2013-01-08 at 5aee090)
410
- + dir.c: rename free_excludes() to clear_exclude_list()
411
- + dir.c: refactor is_path_excluded()
412
- + dir.c: refactor is_excluded()
413
- + dir.c: refactor is_excluded_from_list()
414
- + dir.c: rename excluded() to is_excluded()
415
- + dir.c: rename excluded_from_list() to is_excluded_from_list()
416
- + dir.c: rename path_excluded() to is_path_excluded()
417
- + dir.c: rename cryptic 'which' variable to more consistent name
418
- + Improve documentation and comments regarding directory traversal API
419
- + api-directory-listing.txt: update to match code
420
- (this branch is used by as/check-ignore.)
412
+* ap/log-mailmap (2013-01-10) 11 commits
413
+ (merged to 'next' on 2013-01-10 at 8544084)
414
+ + log --use-mailmap: optimize for cases without --author/--committer search
415
+ + log: add log.mailmap configuration option
416
+ + log: grep author/committer using mailmap
417
+ + test: add test for --use-mailmap option
418
+ + log: add --use-mailmap option
419
+ + pretty: use mailmap to display username and email
420
+ + mailmap: add mailmap structure to rev_info and pp
421
+ + mailmap: simplify map_user() interface
422
+ + mailmap: remove email copy and length limitation
423
+ + Use split_ident_line to parse author and committer
424
+ + string-list: allow case-insensitive string list
425
422
- Refactor and generally clean up the directory traversal API
423
- implementation.
426
+ Teach commands in the "log" family to optionally pay attention to
427
+ the mailmap.
428
425
- Will merge to 'master'.
429
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
428
-* jk/config-uname (2013-01-03) 1 commit
429
- (merged to 'next' on 2013-01-08 at f986500)
430
- + Makefile: hoist uname autodetection to config.mak.uname
434
+ A minor consistency check patch that does not have much relevance
435
+ to the real world.
436
432
- Move the bits to set fallback default based on the platform from
433
- the main Makefile to a separate file, so that it can be included in
434
- Makefiles in subdirectories.
437
436
- Will merge to 'master'.
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
447
* jc/push-2.0-default-to-simple (2013-01-08) 11 commits
@@ -463,41 +471,6 @@ repositories listed at
471
Will merge to 'master'.
472
473
466
-* jl/interrupt-clone-remove-separate-git-dir (2013-01-05) 1 commit
467
- (merged to 'next' on 2013-01-08 at 568f874)
468
- + clone: support atomic operation with --separate-git-dir
469
-
470
- When "git clone --separate-git-dir" is interrupted, we failed to
471
- remove the real location we created the repository.
472
-
473
- Will merge to 'master'.
474
-
475
-
476
-* rs/leave-base-name-in-name-field-of-tar (2013-01-05) 1 commit
477
- (merged to 'next' on 2013-01-08 at 98f325e)
478
- + archive-tar: split long paths more carefully
479
-
480
- Improve compatibility with implementations of "tar" that do not
481
- like empty name field in header (with the additional prefix field
482
- holding everything).
483
-
484
- Will merge to 'master'.
485
-
486
-
487
-* as/api-allocation-doc (2013-01-06) 1 commit
488
- (merged to 'next' on 2013-01-08 at c80b544)
489
- + api-allocation-growing.txt: encourage better variable naming
490
-
491
- Will merge to 'master'.
492
-
493
-
494
-* jc/comment-cygwin-win32api-in-makefile (2013-01-06) 1 commit
495
- (merged to 'next' on 2013-01-08 at dea04e8)
496
- + Makefile: add comment on CYGWIN_V15_WIN32API
497
-
498
- Will merge to 'master'.
499
-
500
-
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
@@ -505,14 +478,13 @@ repositories listed at
478
Will merge to 'master'.
479
480
508
-* nd/clone-no-separate-git-dir-with-bare (2013-01-06) 1 commit
481
+* nd/clone-no-separate-git-dir-with-bare (2013-01-10) 1 commit
482
- clone: forbid --bare --separate-git-dir <dir>
483
511
- Expecting a reroll.
512
- $gmane/212863
484
+ Will merge to 'next'.
485
486
515
-* nd/parse-pathspec (2013-01-06) 21 commits
487
+* 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
@@ -531,7 +503,6 @@ repositories listed at
503
- commit: convert to use parse_pathspec
504
- clean: convert to use parse_pathspec
505
- Export parse_pathspec() and convert some get_pathspec() calls
534
- - pathspec: make sure the prefix part is wildcard-clean
506
- Add parse_pathspec() that converts cmdline args to struct pathspec
507
- pathspec: save the non-wildcard length part
508
@@ -541,8 +512,6 @@ repositories listed at
512
Unfortunately, this conflicts a couple of topics in flight. I tried
513
to be careful while resolving conflicts, though.
514
544
- Expecting a reroll after the dust settles.
545
-
515
516
* rs/zip-tests (2013-01-07) 4 commits
517
(merged to 'next' on 2013-01-08 at 8e37423)
@@ -571,30 +540,18 @@ repositories listed at
540
Will merge to 'master'.
541
542
574
-* tb/test-shell-lint (2013-01-02) 1 commit
575
- (merged to 'next' on 2013-01-07 at 0bca54a)
576
- + test: Add check-non-portable-shell.pl
577
-
578
- Originally merged to 'next' on 2013-01-04
579
-
580
- Check for common mistakes in the test scripts, based on simple
581
- pattern-matching.
582
-
583
- Will merge to 'master'.
584
-
585
-
543
* jc/doc-maintainer (2013-01-03) 2 commits
587
- - howto/maintain: mark titles for asciidoc
588
- - Documentation: update "howto maintain git"
544
+ (merged to 'next' on 2013-01-11 at f35d582)
545
+ + howto/maintain: mark titles for asciidoc
546
+ + Documentation: update "howto maintain git"
547
548
Describe tools for automation that were invented since this
549
document was originally written.
550
593
- Will merge to 'next'.
594
-
551
552
* fc/remote-testgit-feature-done (2012-10-29) 1 commit
597
- - remote-testgit: properly check for errors
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
@@ -602,8 +559,6 @@ repositories listed at
559
such a retroactive tightening will affect their remote helpers. So
560
let's advance this topic to see what happens.
561
605
- Will merge to 'next'.
606
-
562
563
* mo/cvs-server-updates (2012-12-09) 18 commits
564
(merged to 'next' on 2013-01-08 at 75e2d11)
@@ -631,45 +586,19 @@ repositories listed at
586
Will cook in 'next' for a while to see if anybody screams.
587
588
634
-* aw/rebase-am-failure-detection (2012-10-11) 1 commit
635
- (merged to 'next' on 2013-01-07 at 9e2ee43)
636
- + rebase: Handle cases where format-patch fails
637
-
638
- Originally merged to 'next' on 2013-01-02
639
-
640
- Save output from format-patch command in a temporary file, just in
641
- case it aborts, to give a better failure-case behaviour.
642
-
643
- Will merge to 'master'.
644
-
645
-
589
* ap/status-ignored-in-ignored-directory (2013-01-07) 3 commits
647
- - status: always report ignored tracked directories
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
652
- Originally merged to 'next' on 2013-01-04
653
-
596
Output from "git status --ignored" showed an unexpected interaction
597
with "--untracked".
598
657
- Will merge to 'next'.
658
-
659
-
660
-* jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit
661
- (merged to 'next' on 2013-01-07 at 497bf10)
662
- + merge --no-edit: do not credit people involved in the side branch
663
-
664
- Originally merged to 'next' on 2013-01-02
665
-
666
- Stop spending cycles to compute information to be placed on
667
- commented lines in "merge --no-edit".
668
-
669
- Will merge to 'master'.
599
671
-
672
-* as/check-ignore (2013-01-06) 11 commits
600
+* 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
@@ -681,10 +610,11 @@ repositories listed at
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
684
- (this branch uses as/dir-c-cleanup.)
613
686
- The test it adds seems to break under dash.
687
- Expecting a reroll or fixup.
614
+ Add a new command "git check-ignore" for debugging .gitignore
615
+ files.
616
+
617
+ Will merge to 'next'.
618
619
620
* jc/format-patch-reroll (2013-01-03) 9 commits
@@ -708,19 +638,6 @@ repositories listed at
638
Will merge to 'master'.
639
640
711
-* mz/pick-unborn (2012-12-23) 2 commits
712
- (merged to 'next' on 2013-01-07 at c6c062b)
713
- + learn to pick/revert into unborn branch
714
- + tests: move test_cmp_rev to test-lib-functions
715
-
716
- Originally merged to 'next' on 2013-01-02
717
-
718
- Allows "git cherry-pick $commit" when you do not have any history
719
- behind HEAD yet.
720
-
721
- Will merge to 'master'.
722
-
723
-
641
* nd/retire-fnmatch (2013-01-01) 7 commits
642
(merged to 'next' on 2013-01-07 at ab31f9b)
643
+ Makefile: add USE_WILDMATCH to use wildmatch as fnmatch
@@ -730,7 +647,6 @@ repositories listed at
647
+ wildmatch: support "no FNM_PATHNAME" mode
648
+ wildmatch: make dowild() take arbitrary flags
649
+ wildmatch: rename constants and update prototype
733
- (this branch uses nd/wildmatch.)
650
651
Originally merged to 'next' on 2013-01-04
652
@@ -761,7 +677,8 @@ repositories listed at
677
$gmane/211935
678
679
764
-* zk/clean-report-failure (2013-01-06) 1 commit
680
+* zk/clean-report-failure (2013-01-10) 2 commits
681
+ - [SQUASH???] style fixes
682
- git-clean: Display more accurate delete messages
683
684
"git clean" states what it is going to remove and then goes on to
@@ -769,10 +686,10 @@ repositories listed at
686
removed after recursing into a directory, which makes the output
687
confusing and even wrong.
688
772
- Expecting a response to $gmane/212860.
689
+ Will merge to 'next' after squashing the style fix in.
690
691
775
-* mp/complete-paths (2012-12-21) 1 commit
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
@@ -780,10 +697,7 @@ repositories listed at
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
783
- It has been reported (no surprise) that this does not work inside
784
- subdirectory, and fixing it seems to be non-trivial. $gmane/212642
785
-
786
- Waiting for area-experts' help.
700
+ Waiting for area-experts' help and review.
701
702
703
* bc/append-signed-off-by (2013-01-01) 12 commits
@@ -802,34 +716,3 @@ repositories listed at
716
717
Expecting a reroll.
718
$gmane/212507
805
-
806
-
807
-* nd/wildmatch (2013-01-01) 18 commits
808
- (merged to 'next' on 2013-01-07 at 2a39f7d)
809
- + wildmatch: replace variable 'special' with better named ones
810
- + compat/fnmatch: respect NO_FNMATCH* even on glibc
811
- + wildmatch: fix "**" special case
812
- + t3070: Disable some failing fnmatch tests
813
- + test-wildmatch: avoid Windows path mangling
814
- + Support "**" wildcard in .gitignore and .gitattributes
815
- + wildmatch: make /**/ match zero or more directories
816
- + wildmatch: adjust "**" behavior
817
- + wildmatch: fix case-insensitive matching
818
- + wildmatch: remove static variable force_lower_case
819
- + wildmatch: make wildmatch's return value compatible with fnmatch
820
- + t3070: disable unreliable fnmatch tests
821
- + Integrate wildmatch to git
822
- + wildmatch: follow Git's coding convention
823
- + wildmatch: remove unnecessary functions
824
- + Import wildmatch from rsync
825
- + ctype: support iscntrl, ispunct, isxdigit and isprint
826
- + ctype: make sane_ctype[] const array
827
- (this branch is used by nd/retire-fnmatch.)
828
-
829
- Originally merged to 'next' on 2013-01-01
830
-
831
- Allows pathname patterns in .gitignore and .gitattributes files
832
- with double-asterisks "foo/**/bar" to match any number of directory
833
- hierarchies.
834
-
835
- Will merge to 'master'.