What's cooking (2012/07 #02)
Junio C Hamano committed
Jul 9, 2012 at 13:12 UTC
28cd4f629a8cade3f95338d58894bd8837d3199f
1 file changed
+301
-171
whats-cooking.txt
+301
-171
@@ -1,14 +1,16 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2012, #01; Tue, 3)
3
-X-master-at: b12905140a8239ac687450ad43f18b5f0bcfb62e
4
-X-next-at: c7ed6b9aeb316c5c29cc1de761d47bbd184a3884
2
+Subject: What's cooking in git.git (Jul 2012, #02; Mon, 9)
3
+X-master-at: 299666cc5c792dbc3b67622fcc03d41ff95f4346
4
+X-next-at: 61b12c254ff58ac7c57a6e1ab2aa50b1ada84e72
5
6
-What's cooking in git.git (Jul 2012, #01; Tue, 3)
6
+What's cooking in git.git (Jul 2012, #02; Mon, 9)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
+The fourth and fifth batches of topics have graduated to 'master'.
13
+
14
You can find the changes described here in the integration branches of the
15
repositories listed at
16
@@ -17,6 +19,149 @@ repositories listed at
19
--------------------------------------------------
20
[New Topics]
21
22
+* jl/submodule-rm (2012-07-05) 2 commits
23
+ - rm: remove submodules from the index and the .gitmodules file
24
+ - rm: don't fail when removing populated submodules
25
+
26
+* mh/maint-revisions-doc (2012-07-05) 2 commits
27
+ - Document rev^! and rev^@ as revision specifiers
28
+ - Make <refname> documentation more consistent.
29
+
30
+The tip one is a bit suspicious.
31
+
32
+* nk/maint-gitweb-log-by-lines (2012-07-05) 3 commits
33
+ - gitweb: Add support to Link: tag
34
+ - gitweb: Handle other types of tag in git_print_log
35
+ - gitweb: Cleanup git_print_log()
36
+
37
+Is the use of esc_html() in the tip one correct?
38
+
39
+* pw/git-p4-jobs (2012-07-05) 3 commits
40
+ - git p4: notice Jobs lines in git commit messages
41
+ - git p4 test: refactor marshal_dump
42
+ - git p4: remove unused P4Submit interactive setting
43
+
44
+Will merge to 'next'.
45
+
46
+* pw/git-p4-move (2012-07-05) 2 commits
47
+ - git p4: add support for 'p4 move' in P4Submit
48
+ - git p4: refactor diffOpts calculation
49
+
50
+Will be rerolled.
51
+
52
+* ar/clone-honor-umask-at-top (2012-07-08) 1 commit
53
+ - Restore umasks influence on the permissions of work tree created by clone
54
+
55
+May want to rephrase the log message a bit.
56
+
57
+Will merge to 'next'.
58
+
59
+* jn/vcs-svn (2012-07-05) 12 commits
60
+ (merged to 'next' on 2012-07-09 at 1d97a8f)
61
+ + vcs-svn: allow 64-bit Prop-Content-Length
62
+ + vcs-svn: suppress a signed/unsigned comparison warning
63
+ + vcs-svn: suppress a signed/unsigned comparison warning
64
+ + vcs-svn: suppress signed/unsigned comparison warnings
65
+ + vcs-svn: use strstr instead of memmem
66
+ + vcs-svn: use constcmp instead of prefixcmp
67
+ + vcs-svn: simplify cleanup in apply_one_window
68
+ + vcs-svn: avoid self-assignment in dummy initialization of pre_off
69
+ + vcs-svn: drop no-op reset methods
70
+ + vcs-svn: suppress -Wtype-limits warning
71
+ + vcs-svn: allow import of > 4GiB files
72
+ + vcs-svn: rename check_overflow and its arguments for clarity
73
+
74
+Reroll of db/vcs-svn.
75
+
76
+Will merge to 'master'.
77
+
78
+* mm/mediawiki-tests (2012-07-06) 12 commits
79
+ (merged to 'next' on 2012-07-09 at 4d874e8)
80
+ + git-remote-mediawiki: be more defensive when requests fail
81
+ + git-remote-mediawiki: more efficient 'pull' in the best case
82
+ + git-remote-mediawiki: extract revision-importing loop to a function
83
+ + git-remote-mediawiki: refactor loop over revision ids
84
+ + git-remote-mediawiki: change return type of get_mw_pages
85
+ + git-remote-mediawiki (t9363): test 'File:' import and export
86
+ + git-remote-mediawiki: support for uploading file in test environment
87
+ + git-remote-mediawiki (t9362): test git-remote-mediawiki with UTF8 characters
88
+ + git-remote-mediawiki (t9361): test git-remote-mediawiki pull and push
89
+ + git-remote-mediawiki (t9360): test git-remote-mediawiki clone
90
+ + git-remote-mediawiki: test environment of git-remote-mediawiki
91
+ + git-remote-mediawiki: scripts to install, delete and clear a MediaWiki
92
+ (this branch uses mm/mediawiki-file-attachments.)
93
+
94
+Will merge to 'master'.
95
+
96
+* ph/stash-rerere (2012-07-08) 2 commits
97
+ - stash: invoke rerere in case of conflict
98
+ - test: git-stash conflict sets up rerere
99
+
100
+Will be rerolled but is going in the right direction.
101
+
102
+* tg/ce-namelen (2012-07-08) 1 commit
103
+ - Replace strlen() with ce_namelen()
104
+
105
+Trivially correct clean-up and micro optimization.
106
+
107
+* jn/makefile-cleanup (2012-07-09) 14 commits
108
+ - Makefile: document ground rules for target-specific dependencies
109
+ - Makefile: move GIT-VERSION-FILE dependencies closer to use
110
+ - Makefile: build instaweb similar to other scripts
111
+ - Makefile: update scripts when build-time parameters change
112
+ - Makefile: do not replace @@GIT_VERSION@@ in shell scripts
113
+ - Makefile: split prefix flags from GIT-CFLAGS
114
+ - Makefile: be silent when only GIT_USER_AGENT changes
115
+ - Makefile: split GIT_USER_AGENT from GIT-CFLAGS
116
+ - Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
117
+ - Makefile: apply dependencies consistently to sparse/asm targets
118
+ - Makefile: do not have git.o depend on common-cmds.h
119
+ - Makefile: fold XDIFF_H and VCSSVN_H into LIB_H
120
+ - Makefile: fold MISC_H into LIB_H
121
+ - Makefile: sort LIB_H list
122
+ (this branch is tangled with jk/version-string-dependency.)
123
+
124
+Tweaks and replaces jk/version-string-dependency.
125
+
126
+Will merge to 'next'.
127
+
128
+* cw/amend-commit-without-message (2012-07-09) 1 commit
129
+ - Allow edit of empty message with commit --amend
130
+
131
+"commit --amend" used to refuse amending a commit with an empty log
132
+message, with or without "--allow-empty-message".
133
+
134
+Will merge to 'next'.
135
+
136
+--------------------------------------------------
137
+[Graduated to "master"]
138
+
139
+* cw/help-over-network (2012-06-28) 2 commits
140
+ (merged to 'next' on 2012-07-03 at 99e8d28)
141
+ + Allow help.htmlpath to be a URL prefix
142
+ + Add config variable to set HTML path for git-help --web
143
+
144
+"git help -w $cmd" can show HTML version of documentation for
145
+"git-$cmd" by setting help.htmlpath to somewhere other than the
146
+default location where the build procedure installs them locally;
147
+the variable can even point at a http:// URL.
148
+
149
+* cw/no-detaching-an-unborn (2012-06-26) 1 commit
150
+ (merged to 'next' on 2012-07-03 at 552c5ca)
151
+ + git-checkout: disallow --detach on unborn branch
152
+
153
+"git checkout --detach", when you are still on an unborn branch,
154
+should be forbidden, but it wasn't.
155
+
156
+* hv/remote-end-hung-up (2012-06-19) 1 commit
157
+ (merged to 'next' on 2012-06-25 at d3f29e2)
158
+ + remove the impression of unexpectedness when access is denied
159
+
160
+When we get disconnected while expecting a response from the remote
161
+side because authentication failed, we issued an error message "The
162
+remote side hung up unexpectedly." Give hint that it may be a
163
+permission problem in the message when we can reasonably suspect it.
164
+
165
* jc/maint-blame-unique-abbrev (2012-07-02) 1 commit
166
(merged to 'next' on 2012-07-03 at c7ed6b9)
167
+ blame: compute abbreviation width that ensures uniqueness
@@ -24,25 +169,103 @@ repositories listed at
169
"git blame" did not try to make sure the abbreviated commit object
170
names in its output are unique.
171
27
-* jk/push-delete-ref-error-message (2012-07-03) 1 commit
28
- - push: don't guess at qualifying remote refs on deletion
172
+* jn/perl-makemaker-leading-paths (2012-06-29) 2 commits
173
+ (merged to 'next' on 2012-06-29 at 0f17059)
174
+ + perl/Makefile: Fix a missing double-quote
175
+ (merged to 'next' on 2012-06-28 at 286d854)
176
+ + perl/Makefile: move "mkdir -p" to module installation loop for maintainability
177
30
-The error message from "git push $there :bogo" mentioned we tried
31
-and failed to guess what ref is being deleted based on the LHS of
32
-the refspec, which we don't.
178
+Minor build tweak. People who do not use ExtUtils::MakeMaker may
179
+want to test this before it hits the 'master' branch.
180
34
---------------------------------------------------
35
-[Stalled]
181
+* js/fast-export-paths-with-spaces (2012-06-27) 1 commit
182
+ (merged to 'next' on 2012-07-03 at f9c23e9)
183
+ + fast-export: quote paths with spaces
184
37
-* db/vcs-svn (2012-06-01) 6 commits
38
- - vcs-svn: drop no-op reset methods
39
- - vcs-svn: fix signedness warnings
40
- - vcs-svn: prefer strstr over memmem
41
- - vcs-svn: prefer constcmp to prefixcmp
42
- - vcs-svn: simplify cleanup in apply_one_window()
43
- - vcs-svn: fix clang-analyzer error
185
+"git fast-export" produced an input stream for fast-import without
186
+properly quoting pathnames when they contain SPs in them.
187
+
188
+* mm/config-xdg (2012-06-25) 4 commits
189
+ (merged to 'next' on 2012-06-28 at 57049d1)
190
+ + config: write to $XDG_CONFIG_HOME/git/config file when appropriate
191
+ + Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes
192
+ + Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore
193
+ + config: read (but not write) from $XDG_CONFIG_HOME/git/config file
194
+
195
+Teach git to read various information from $XDG_CONFIG_HOME/git/ to allow
196
+the user to avoid cluttering $HOME.
197
+
198
+* mm/credential-plumbing (2012-07-08) 4 commits
199
+ (merged to 'next' on 2012-07-08 at fce8ea2)
200
+ + git-remote-mediawiki: update comments to reflect credential support
201
+ (merged to 'next' on 2012-06-28 at 6e6fe9f)
202
+ + git-remote-mediawiki: add credential support
203
+ + git credential fill: output the whole 'struct credential'
204
+ + add 'git credential' plumbing command
205
+ (this branch is tangled with mm/mediawiki-file-attachments and mm/mediawiki-tests.)
206
+
207
+Expose the credential API to scripted Porcelain writers.
208
+
209
+* mz/empty-rebase-test (2012-06-27) 1 commit
210
+ (merged to 'next' on 2012-07-03 at 1e7de3f)
211
+ + add test case for rebase of empty commit
212
+
213
+We did not have test to make sure "git rebase" without extra options
214
+filters out an empty commit in the original history.
215
+
216
+* nd/clone-single-fix (2012-06-22) 1 commit
217
+ (merged to 'next' on 2012-06-26 at c9fff5e)
218
+ + clone: fix ref selection in --single-branch --branch=xxx
219
+
220
+"git clone --single-branch" to clone a single branch did not limit
221
+the cloning to the specified branch.
222
+
223
+* pw/git-p4-tests (2012-06-27) 10 commits
224
+ (merged to 'next' on 2012-07-03 at 9bd9cda)
225
+ + git p4 test: fix badp4dir test
226
+ + git p4 test: split up big t9800 test
227
+ + git p4 test: cleanup_git should make a new $git
228
+ + git p4 test: copy source indeterminate
229
+ + git p4 test: check for error message in failed test
230
+ + git p4 test: rename some "git-p4 command" strings
231
+ + git p4 test: never create default test repo
232
+ + git p4 test: simplify quoting involving TRASH_DIRECTORY
233
+ + git p4 test: use real_path to resolve p4 client symlinks
234
+ + git p4 test: wait longer for p4d to start and test its pid
235
+ (this branch is used by pw/git-p4-jobs and pw/git-p4-move.)
236
+
237
+More "git p4" tests.
238
+
239
+* rj/platform-pread-may-be-thread-unsafe (2012-06-26) 1 commit
240
+ (merged to 'next' on 2012-06-28 at ce5f79f)
241
+ + index-pack: Disable threading on cygwin
242
+
243
+On Cygwin, the platform pread(3) is not thread safe, just like our
244
+own compat/ emulation, and cannot be used in the index-pack program.
245
+
246
+* th/diff-no-index-fixes (2012-06-22) 2 commits
247
+ (merged to 'next' on 2012-06-26 at 450e781)
248
+ + diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
249
+ + diff: handle relative paths in no-index
250
+
251
+"git diff --no-index" did not correctly handle relative paths and
252
+did not correctly give exit codes when run under "--quiet" option.
253
45
-Waiting for Jonathan's clean-up offered earlier.
254
+* vr/use-our-perl-in-tests (2012-06-24) 4 commits
255
+ (merged to 'next' on 2012-07-03 at 90dfcf0)
256
+ + t/README: add a bit more Don'ts
257
+ + tests: enclose $PERL_PATH in double quotes
258
+ + t/test-lib.sh: export PERL_PATH for use in scripts
259
+ + t: Replace 'perl' by $PERL_PATH
260
+ (this branch is used by jc/test-lib-source-build-options-early.)
261
+
262
+Some implementations of Perl terminates "lines" with CRLF even when
263
+the script is operating on just a sequence of bytes. Make sure to
264
+use "$PERL_PATH", the version of Perl the user told Git to use, in
265
+our tests to avoid unnecessary breakages in tests.
266
+
267
+--------------------------------------------------
268
+[Stalled]
269
270
* jc/apply-3way (2012-06-13) 19 commits
271
- apply --3way: tests
@@ -112,8 +335,17 @@ not working :-(.
335
--------------------------------------------------
336
[Cooking]
337
115
-* tb/sanitize-decomposed-utf-8-pathname (2012-07-02) 1 commit
116
- - git on Mac OS and precomposed unicode
338
+* jk/push-delete-ref-error-message (2012-07-03) 1 commit
339
+ (merged to 'next' on 2012-07-09 at 82c6bd2)
340
+ + push: don't guess at qualifying remote refs on deletion
341
+
342
+The error message from "git push $there :bogo" mentioned we tried
343
+and failed to guess what ref is being deleted based on the LHS of
344
+the refspec, which we don't.
345
+
346
+* tb/sanitize-decomposed-utf-8-pathname (2012-07-08) 1 commit
347
+ (merged to 'next' on 2012-07-09 at 61b12c2)
348
+ + git on Mac OS and precomposed unicode
349
350
Teaches git to normalize pathnames read from readdir(3) and all
351
arguments from the command line into precomposed UTF-8 (assuming
@@ -123,16 +355,11 @@ I think there still are other places that need conversion
355
(e.g. paths that are read from stdin for some commands), but this
356
should be a good first step in the right direction.
357
126
-Will merge to 'next'.
127
-
128
-* cw/no-detaching-an-unborn (2012-06-26) 1 commit
129
- (merged to 'next' on 2012-07-03 at 552c5ca)
130
- + git-checkout: disallow --detach on unborn branch
131
-
132
-"git checkout --detach", when you are still on an unborn branch,
133
-should be forbidden, but it wasn't.
358
+Will merge to 'master'.
359
135
-* cw/rebase-i-root (2012-06-26) 2 commits
360
+* cw/rebase-i-root (2012-07-05) 3 commits
361
+ (merged to 'next' on 2012-07-05 at aeb4c56)
362
+ + t3404: make test 57 work with dash and others
363
(merged to 'next' on 2012-07-03 at 231c0a4)
364
+ Add tests for rebase -i --root without --onto
365
+ rebase -i: support --root without --onto
@@ -140,25 +367,22 @@ should be forbidden, but it wasn't.
367
"git rebase [-i] --root $tip" can now be used to rewrite all the
368
history down to the root.
369
143
-* js/fast-export-paths-with-spaces (2012-06-27) 1 commit
144
- (merged to 'next' on 2012-07-03 at f9c23e9)
145
- + fast-export: quote paths with spaces
146
-
147
-"git fast-export" produced an input stream for fast-import without
148
-properly quoting pathnames when they contain SPs in them.
149
-
150
-* mm/mediawiki-file-attachments (2012-06-27) 5 commits
370
+* mm/mediawiki-file-attachments (2012-07-04) 6 commits
371
+ (merged to 'next' on 2012-07-09 at 4b85fa2)
372
+ + git-remote-mediawiki: improve support for non-English Wikis
373
(merged to 'next' on 2012-07-03 at 90f2f45)
374
+ git-remote-mediawiki: import "File:" attachments
375
+ git-remote-mediawiki: split get_mw_pages into smaller functions
376
+ git-remote-mediawiki: send "File:" attachments to a remote wiki
377
+ git-remote-mediawiki: don't "use encoding 'utf8';"
378
+ git-remote-mediawiki: don't compute the diff when getting commit message
157
- (this branch uses mm/credential-plumbing.)
379
+ (this branch is used by mm/mediawiki-tests.)
380
381
"mediawiki" remote helper (in contrib/) learned to handle file
382
attachments.
383
384
+Will merge to 'master'.
385
+
386
* mz/rebase-no-mbox (2012-06-26) 4 commits
387
(merged to 'next' on 2012-07-03 at 5bf5c12)
388
+ am: don't call mailinfo if $rebasing
@@ -171,32 +395,13 @@ the patch text directly out of existing commits. This will help
395
rebasing commits that have confusing "diff" output in their log
396
messages.
397
174
-* pw/git-p4-tests (2012-06-27) 10 commits
175
- (merged to 'next' on 2012-07-03 at 9bd9cda)
176
- + git p4 test: fix badp4dir test
177
- + git p4 test: split up big t9800 test
178
- + git p4 test: cleanup_git should make a new $git
179
- + git p4 test: copy source indeterminate
180
- + git p4 test: check for error message in failed test
181
- + git p4 test: rename some "git-p4 command" strings
182
- + git p4 test: never create default test repo
183
- + git p4 test: simplify quoting involving TRASH_DIRECTORY
184
- + git p4 test: use real_path to resolve p4 client symlinks
185
- + git p4 test: wait longer for p4d to start and test its pid
186
-
187
-More "git p4" tests.
188
-
189
-* rj/platform-pread-may-be-thread-unsafe (2012-06-26) 1 commit
190
- (merged to 'next' on 2012-06-28 at ce5f79f)
191
- + index-pack: Disable threading on cygwin
192
-
193
-On Cygwin, the platform pread(3) is not thread safe, just like our
194
-own compat/ emulation, and cannot be used in the index-pack program.
398
+Will merge to 'master'.
399
400
* jc/refactor-diff-stdin (2012-06-28) 3 commits
197
- - diff-index.c: "git diff" has no need to read blob from the standard input
198
- - diff-index.c: unify handling of command line paths
199
- - diff-index.c: do not pretend paths are pathspecs
401
+ (merged to 'next' on 2012-07-09 at ef407ee)
402
+ + diff-index.c: "git diff" has no need to read blob from the standard input
403
+ + diff-index.c: unify handling of command line paths
404
+ + diff-index.c: do not pretend paths are pathspecs
405
406
Due to the way "git diff --no-index" is bolted onto by touching the
407
low level code that is shared with the rest of the "git diff" code,
@@ -207,23 +412,7 @@ further to remove code that reads from the standard input from the
412
core side, which is never necessary when git is running its usual
413
diff operation.
414
210
-Will merge to 'next', and later down to older maintenance releases.
211
-
212
-* mz/empty-rebase-test (2012-06-27) 1 commit
213
- (merged to 'next' on 2012-07-03 at 1e7de3f)
214
- + add test case for rebase of empty commit
215
-We did not have test to make sure "git rebase" without extra options
216
-filters out an empty commit in the original history.
217
-
218
-* cw/help-over-network (2012-06-28) 2 commits
219
- (merged to 'next' on 2012-07-03 at 99e8d28)
220
- + Allow help.htmlpath to be a URL prefix
221
- + Add config variable to set HTML path for git-help --web
222
-
223
-"git help -w $cmd" can show HTML version of documentation for
224
-"git-$cmd" by setting help.htmlpath to somewhere other than the
225
-default location where the build procedure installs them locally;
226
-the variable can even point at a http:// URL.
415
+Will merge to 'master', and later down to older maintenance releases.
416
417
* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit
418
- commit/commit-tree: correct latin1 to utf-8
@@ -238,7 +427,6 @@ Hopefully it will be rerolled.
427
428
* jc/test-lib-source-build-options-early (2012-06-24) 1 commit
429
- test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
241
- (this branch uses vr/use-our-perl-in-tests.)
430
431
Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that
432
records the shell and Perl the user told us to use with Git a lot
@@ -248,58 +436,7 @@ one of its early operations.
436
Needs to be eyeballed by people who run tests with exotic options
437
like valgrind, --root=/dev/shm/somewhere, etc.
438
251
-* mm/config-xdg (2012-06-25) 4 commits
252
- (merged to 'next' on 2012-06-28 at 57049d1)
253
- + config: write to $XDG_CONFIG_HOME/git/config file when appropriate
254
- + Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes
255
- + Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore
256
- + config: read (but not write) from $XDG_CONFIG_HOME/git/config file
257
-
258
-Teach git to read various information from $XDG_CONFIG_HOME/git/ to allow
259
-the user to avoid cluttering $HOME.
260
-
261
-* mm/credential-plumbing (2012-06-25) 3 commits
262
- (merged to 'next' on 2012-06-28 at 6e6fe9f)
263
- + git-remote-mediawiki: add credential support
264
- + git credential fill: output the whole 'struct credential'
265
- + add 'git credential' plumbing command
266
- (this branch is used by mm/mediawiki-file-attachments.)
267
-
268
-Expose the credential API to scripted Porcelain writers.
269
-
270
-* th/diff-no-index-fixes (2012-06-22) 2 commits
271
- (merged to 'next' on 2012-06-26 at 450e781)
272
- + diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
273
- + diff: handle relative paths in no-index
274
-
275
-"git diff --no-index" did not correctly handle relative paths and
276
-did not correctly give exit codes when run under "--quiet" option.
277
-
278
-Will merge to 'master'.
279
-
280
-* nd/clone-single-fix (2012-06-22) 1 commit
281
- (merged to 'next' on 2012-06-26 at c9fff5e)
282
- + clone: fix ref selection in --single-branch --branch=xxx
283
-
284
-"git clone --single-branch" to clone a single branch did not limit
285
-the cloning to the specified branch.
286
-
287
-Will merge to 'master'.
288
-
289
-* vr/use-our-perl-in-tests (2012-06-24) 4 commits
290
- (merged to 'next' on 2012-07-03 at 90dfcf0)
291
- + t/README: add a bit more Don'ts
292
- + tests: enclose $PERL_PATH in double quotes
293
- + t/test-lib.sh: export PERL_PATH for use in scripts
294
- + t: Replace 'perl' by $PERL_PATH
295
- (this branch is used by jc/test-lib-source-build-options-early.)
296
-
297
-Some implementations of Perl terminates "lines" with CRLF even when
298
-the script is operating on just a sequence of bytes. Make sure to
299
-use "$PERL_PATH", the version of Perl the user told Git to use, in
300
-our tests to avoid unnecessary breakages in tests.
301
-
302
-* jc/sha1-name-more (2012-07-03) 25 commits
439
+* jc/sha1-name-more (2012-07-04) 25 commits
440
- rev-parse --disambiguate=<prefix>
441
- rev-parse: A and B in "rev-parse A..B" refer to committish
442
- reset: the command takes committish
@@ -331,50 +468,18 @@ is always a commit object, "A" in "git log A" must be a committish,
468
and "A" and "B" in "git log A...B" both must be committish, etc., to
469
prolong the lifetime of abbreviated object names.
470
334
-* jk/version-string-dependency (2012-06-20) 11 commits
335
- - Makefile: move GIT-VERSION-FILE dependencies closer to use
336
- - Makefile: build instaweb similar to other scripts
337
- - Makefile: update scripts when build-time parameters change
338
- - Makefile: do not replace @@GIT_VERSION@@ in shell scripts
339
- - Makefile: split prefix flags from GIT-CFLAGS
340
- - Makefile: split GIT_USER_AGENT from GIT-CFLAGS
341
- - Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
342
- - Makefile: apply dependencies consistently to sparse/asm targets
343
- - Makefile: do not have git.o depend on common-cmds.h
344
- - Makefile: fold MISC_H into LIB_H
345
- - Makefile: sort LIB_H list
346
-
347
-Will keep in 'pu' to give Peff and Jonathan to work out improvements.
348
-
349
-* jn/perl-makemaker-leading-paths (2012-06-29) 2 commits
350
- (merged to 'next' on 2012-06-29 at 0f17059)
351
- + perl/Makefile: Fix a missing double-quote
352
- (merged to 'next' on 2012-06-28 at 286d854)
353
- + perl/Makefile: move "mkdir -p" to module installation loop for maintainability
354
-
355
-Minor build tweak. People who do not use ExtUtils::MakeMaker may
356
-want to test this before it hits the 'master' branch.
471
+Will merge to 'next'.
472
473
* tr/maint-show-walk (2012-06-19) 2 commits
359
- - show: fix "range implies walking"
360
- - Demonstrate git-show is broken with ranges
474
+ (merged to 'next' on 2012-07-09 at c8e0e06)
475
+ + show: fix "range implies walking"
476
+ + Demonstrate git-show is broken with ranges
477
478
Fixes "git show"'s auto-walking behaviour, and make it behave just
479
like "git log" does when it walks.
480
481
Note that this is different from Thomas's patch.
482
367
-Waiting for response from original author.
368
-
369
-* hv/remote-end-hung-up (2012-06-19) 1 commit
370
- (merged to 'next' on 2012-06-25 at d3f29e2)
371
- + remove the impression of unexpectedness when access is denied
372
-
373
-When we get disconnected while expecting a response from the remote
374
-side because authentication failed, we issued an error message "The
375
-remote side hung up unexpectedly." Give hint that it may be a
376
-permission problem in the message when we can reasonably suspect it.
377
-
483
Will merge to 'master'.
484
485
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
@@ -386,8 +491,7 @@ Will defer for 6 months until ancient "less" goes extinct.
491
(merged to 'next' on 2012-06-26 at fea512a)
492
+ push: start warning upcoming default change for push.default
493
389
-Hopefully we can have a solidly tested series early in 1.7.12 or
390
-1.7.13 at the latest.
494
+Will defer for another cycle.
495
496
--------------------------------------------------
497
[Discarded]
@@ -409,3 +513,29 @@ people who get the message when their current branch is not pushed.
513
514
I had an impression after the discussion thread that a redesign is
515
coming, but it hasn't happened yet.
516
+
517
+* db/vcs-svn (2012-06-01) 6 commits
518
+ . vcs-svn: drop no-op reset methods
519
+ . vcs-svn: fix signedness warnings
520
+ . vcs-svn: prefer strstr over memmem
521
+ . vcs-svn: prefer constcmp to prefixcmp
522
+ . vcs-svn: simplify cleanup in apply_one_window()
523
+ . vcs-svn: fix clang-analyzer error
524
+
525
+Replaced by jn/vcs-svn.
526
+
527
+* jk/version-string-dependency (2012-06-20) 11 commits
528
+ . Makefile: move GIT-VERSION-FILE dependencies closer to use
529
+ . Makefile: build instaweb similar to other scripts
530
+ . Makefile: update scripts when build-time parameters change
531
+ . Makefile: do not replace @@GIT_VERSION@@ in shell scripts
532
+ . Makefile: split prefix flags from GIT-CFLAGS
533
+ . Makefile: split GIT_USER_AGENT from GIT-CFLAGS
534
+ . Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
535
+ . Makefile: apply dependencies consistently to sparse/asm targets
536
+ . Makefile: do not have git.o depend on common-cmds.h
537
+ - Makefile: fold MISC_H into LIB_H
538
+ - Makefile: sort LIB_H list
539
+ (this branch is tangled with jn/makefile-cleanup.)
540
+
541
+Replaced by jn/makefile-cleanup.