What's cooking (2012/09 #06)
Junio C Hamano committed
Sep 17, 2012 at 17:43 UTC
c9b808781b74af091de5e36cfbcbfebec4e02fda
1 file changed
+226
-237
whats-cooking.txt
+226
-237
@@ -1,33 +1,28 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2012, #05; Fri, 14)
4
-X-master-at: 1084f3b844d80d84d2d318bc562b78514cd78028
5
-X-next-at: d6bdd97b1590ffc7218c72138a0a58a80c655529
3
+Subject: What's cooking in git.git (Sep 2012, #06; Mon, 17)
4
+X-master-at: 5976753e732186d7f8a5c6af55a8ce3e2d2b677b
5
+X-next-at: 3c10a18fa86d85c603e54c9c31776661e9d9fa29
6
7
-What's cooking in git.git (Sep 2012, #05; Fri, 14)
7
+What's cooking in git.git (Sep 2012, #06; Mon, 17)
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
-The topic descriptions are indented in this issue as an experiment;
15
-it is slightly harder to edit for me and I personally find it harder
16
-to read, but perhaps that is because I am used to reading in the
17
-previous format. There are wider gaps between topics that may turn
18
-out to be sufficient to visually identify where each entry begins
19
-and ends. We'll see.
14
+The seventh wave of topics are in 'master' now.
15
+
16
+The archive-zip topic really needs help by people on platforms where
17
+zip archive is an important part of life (in other words, not UNIX)
18
+to test, in order to make sure the archive generated out of a tree
19
+with non-ascii filenames are usable on their platforms.
20
21
I'm planning to keep this cycle reasonably short and aim for tagging
22
the result as 1.8.0 at the end of 9th week, on October 21st, after
23
which I'd disappear for a few weeks. http://tinyurl.com/gitCal is
24
where you can always find my rough tagging schedule at.
25
26
-I think we can start thinking about feature freeze once the topics
27
-in 'next' that are scheduled to graduate to 'master' already are
28
-fully cooked. For any late-coming topic, there always is the next
29
-cycle ;-)
30
-
26
You can find the changes described here in the integration branches of the
27
repositories listed at
28
@@ -36,73 +31,66 @@ repositories listed at
31
--------------------------------------------------
32
[Graduated to "master"]
33
39
-* dj/fetch-all-tags (2012-09-07) 1 commit
40
- (merged to 'next' on 2012-09-11 at 083a029)
41
- + fetch --all: pass --tags/--no-tags through to each remote
34
+* cn/branch-set-upstream-to (2012-09-11) 2 commits
35
+ (merged to 'next' on 2012-09-12 at e162318)
36
+ + completion: complete branch name for "branch --set-upstream-to="
37
+ + completion: add --set-upstream-to and --unset-upstream
38
43
- "git fetch --all", when passed "--no-tags", did not honor the
44
- "--no-tags" option while fetching from individual remotes (the same
45
- issue existed with "--tags", but combination "--all --tags" makes
46
- much less sense than "--all --no-tags").
39
+ Finishing touches to the recently graduated topic to introduce
40
+ "git branch --set-upstream-to" option.
41
+
42
+
43
+* dg/run-command-child-cleanup (2012-09-11) 1 commit
44
+ (merged to 'next' on 2012-09-12 at aa5f9e2)
45
+ + run-command.c: fix broken list iteration in clear_child_for_cleanup
46
+
47
+ The code to wait for subprocess and remove it from our internal queue
48
+ wasn't quite right.
49
50
49
-* mh/abspath (2012-09-10) 9 commits
50
- (merged to 'next' on 2012-09-11 at 5e29b53)
51
- + t0060: split absolute path test in two to exercise some of it on Windows
52
- + t0060: verify that real_path() removes extra slashes
53
- + real_path(): properly handle nonexistent top-level paths
54
- + t0060: verify that real_path() works correctly with absolute paths
55
- + real_path(): reject the empty string
56
- + t0060: verify that real_path() fails if passed the empty string
57
- + absolute_path(): reject the empty string
58
- + t0060: verify that absolute_path() fails if passed the empty string
59
- + t0060: move tests of real_path() from t0000 to here
51
+* jc/ll-merge-binary-ours (2012-09-12) 3 commits
52
+ (merged to 'next' on 2012-09-12 at 9a7a6b3)
53
+ + ll-merge: warn about inability to merge binary files only when we can't
54
+ + attr: "binary" attribute should choose built-in "binary" merge driver
55
+ + merge: teach -Xours/-Xtheirs to binary ll-merge driver
56
57
+ "git merge -Xtheirs" did not help content-level merge of binary
58
+ files; it should just take their version. Also "*.jpg binary" in
59
+ the attributes did not imply they should use the binary ll-merge
60
+ driver.
61
62
-* nd/checkout-option-parsing-fix (2012-09-11) 3 commits
63
- (merged to 'next' on 2012-09-11 at 3d3ef13)
64
- + checkout: reorder option handling
65
- + checkout: move more parameters to struct checkout_opts
66
- + checkout: pass "struct checkout_opts *" as const pointer
62
68
- The option parsing of "git checkout" had error checking, dwim and
69
- defaulting missing options, all mixed in the code, and issuing an
70
- appropriate error message with useful context was getting harder.
71
- Reorganize the code and allow giving a proper diagnosis when the
72
- user says "git checkout -b -t foo bar" (e.g. "-t" is not a good name
73
- for a branch).
63
+* jc/mailinfo-RE (2012-09-09) 1 commit
64
+ (merged to 'next' on 2012-09-12 at 131edbf)
65
+ + mailinfo: strip "RE: " prefix
66
67
+ We strip the prefix from "Re: subject" and also from a less common
68
+ "re: subject", but left even less common "RE: subject" intact.
69
76
-* nd/i18n-status (2012-09-06) 1 commit
77
- (merged to 'next' on 2012-09-11 at 7cfa224)
78
- + status: remove i18n legos
70
71
+* jc/maint-blame-no-such-path (2012-09-11) 2 commits
72
+ (merged to 'next' on 2012-09-14 at 84064d5)
73
+ + blame: allow "blame file" in the middle of a conflicted merge
74
+ + blame $path: avoid getting fooled by case insensitive filesystems
75
81
-* rj/path-cleanup (2012-09-04) 5 commits
82
- (merged to 'next' on 2012-09-11 at 9e8da84)
83
- + Call mkpathdup() rather than xstrdup(mkpath(...))
84
- + Call git_pathdup() rather than xstrdup(git_path("..."))
85
- + path.c: Use vsnpath() in the implementation of git_path()
86
- + path.c: Don't discard the return value of vsnpath()
87
- + path.c: Remove the 'git_' prefix from a file scope function
76
+ "git blame MAKEFILE" run in a history that has "Makefile" but not
77
+ "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
78
+ confused on a case insensitive filesystem and failed to do so.
79
80
+ Even during a conflicted merge, "git blame $path" always meant to
81
+ blame uncommitted changes to the "working tree" version; make it
82
+ more useful by showing cleanly merged parts as coming from the other
83
+ branch that is being merged.
84
90
-* rj/tap-fix (2012-09-02) 6 commits
91
- (merged to 'next' on 2012-09-11 at 4104358)
92
- + test-lib.sh: Suppress the "passed all ..." message if no tests run
93
- + test-lib.sh: Add check for invalid use of 'skip_all' facility
94
- + test-lib.sh: Fix some shell coding style violations
95
- + t4016-*.sh: Skip all tests rather than each test
96
- + t3902-*.sh: Skip all tests rather than each test
97
- + t3300-*.sh: Fix a TAP parse error
85
86
+* jk/config-warn-on-inaccessible-paths (2012-09-13) 1 commit
87
+ (merged to 'next' on 2012-09-14 at a9bba78)
88
+ + attr: failure to open a .gitattributes file is OK with ENOTDIR
89
100
-* sn/ls-remote-get-url-doc (2012-09-07) 1 commit
101
- (merged to 'next' on 2012-09-11 at 9d09780)
102
- + ls-remote: document the '--get-url' option
90
+ The attribute system may be asked for a path whose leading
91
+ directories do not exist in the current working tree. In addition
92
+ to ENOENT, ENOTDIR must be ignored.
93
104
---------------------------------------------------
105
-[New Topics]
94
95
* jw/doc-commit-title (2012-09-13) 1 commit
96
(merged to 'next' on 2012-09-14 at d6bdd97)
@@ -112,7 +100,39 @@ repositories listed at
100
log" to say "title of commit" with definition of what that "title"
101
is.
102
115
- Will merge to 'master' as part of the seventh batch.
103
+
104
+* mh/fetch-filter-refs (2012-09-15) 15 commits
105
+ (merged to 'next' on 2012-09-15 at 8767db3)
106
+ + test-string-list.c: Fix some sparse warnings
107
+ (merged to 'next' on 2012-09-14 at 567afe4)
108
+ + fetch-pack: eliminate spurious error messages
109
+ + cmd_fetch_pack(): simplify computation of return value
110
+ + fetch-pack: report missing refs even if no existing refs were received
111
+ + cmd_fetch_pack(): return early if finish_connect() fails
112
+ + filter_refs(): simplify logic
113
+ + filter_refs(): build refs list as we go
114
+ + filter_refs(): delete matched refs from sought list
115
+ + fetch_pack(): update sought->nr to reflect number of unique entries
116
+ + filter_refs(): do not check the same sought_pos twice
117
+ + Change fetch_pack() and friends to take string_list arguments
118
+ + fetch_pack(): reindent function decl and defn
119
+ + Rename static function fetch_pack() to http_fetch_pack()
120
+ + t5500: add tests of fetch-pack --all --depth=N $URL $REF
121
+ + t5500: add tests of error output for missing refs
122
+ (this branch uses mh/string-list.)
123
+
124
+ Code simplification and clarification.
125
+
126
+
127
+* mh/string-list (2012-09-12) 6 commits
128
+ (merged to 'next' on 2012-09-14 at b4c50bc)
129
+ + api-string-list.txt: initialize the string_list the easy way
130
+ + string_list: add a function string_list_longest_prefix()
131
+ + string_list: add a new function, string_list_remove_duplicates()
132
+ + string_list: add a new function, filter_string_list()
133
+ + string_list: add two new functions for splitting strings
134
+ + string_list: add function string_list_append_nodup()
135
+ (this branch is used by mh/fetch-filter-refs.)
136
137
138
* nd/maint-diffstat-summary (2012-09-14) 1 commit
@@ -127,49 +147,81 @@ repositories listed at
147
The original had trivial thinko in reverting Q_(), which has been
148
fixed.
149
130
- Will merge to 'master' as part of the seventh batch.
150
151
+* sl/autoconf (2012-09-11) 2 commits
152
+ (merged to 'next' on 2012-09-12 at 6ebe199)
153
+ + build: don't duplicate substitution of make variables
154
+ + build: improve GIT_CONF_SUBST signature
155
133
-* nd/fetch-status-alignment (2012-09-14) 1 commit
134
- - fetch: align per-ref summary report in UTF-8 locales
156
+ Reduces repetition in configure.ac.
157
136
- Will merge to 'next'.
158
+--------------------------------------------------
159
+[New Topics]
160
161
+* rt/maint-clone-single (2012-09-16) 2 commits
162
+ - fixup! check what we really care about in a more direct way
163
+ - clone --single: limit the fetch refspec to fetched branch
164
139
-* mv/cherry-pick-s (2012-09-14) 1 commit
140
- - cherry-pick: don't forget -s on failure
165
+ Running "git fetch" in a repository made with "git clone --single"
166
+ slurps all the branches, defeating the point of "--single".
167
142
- Will merge to 'next'.
168
169
+* ep/malloc-check-perturb (2012-09-14) 2 commits
170
+ - MALLOC_CHECK: various clean-ups
171
+ - Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
172
145
-* jc/maint-log-grep-all-match (2012-09-14) 9 commits
146
- - t7810-grep: test --all-match with multiple --grep and --author options
147
- - t7810-grep: test interaction of multiple --grep and --author options
148
- - t7810-grep: test multiple --author with --all-match
149
- - t7810-grep: test multiple --grep with and without --all-match
150
- - t7810-grep: bring log --grep tests in common form
151
- (merged to 'next' on 2012-09-14 at 86b848c)
152
- + log: document use of multiple commit limiting options
153
- + log --grep/--author: honor --all-match honored for multiple --grep patterns
154
- + grep: show --debug output only once
155
- + grep: teach --debug option to dump the parse tree
173
+ Queued with fix-ups.
174
+ Waiting for response from the author.
175
157
- Fix a long-standing bug in "git log --grep" when multiple "--grep"
158
- are used together with "--all-match" and "--author" or "--committer".
176
160
- Will merge to 'next' after eyeballing the tests
161
- Help in reviewing them is appreciated.
177
+* jc/make-static (2012-09-15) 14 commits
178
+ (merged to 'next' on 2012-09-17 at 3a7d87a)
179
+ + sequencer.c: mark a private file-scope symbol as static
180
+ + ident.c: mark private file-scope symbols as static
181
+ + trace.c: mark a private file-scope symbol as static
182
+ + wt-status.c: mark a private file-scope symbol as static
183
+ + read-cache.c: mark a private file-scope symbol as static
184
+ + strbuf.c: mark a private file-scope symbol as static
185
+ + sha1-array.c: mark a private file-scope symbol as static
186
+ + symlinks.c: mark private file-scope symbols as static
187
+ + notes.c: mark a private file-scope symbol as static
188
+ + rerere.c: mark private file-scope symbols as static
189
+ + graph.c: mark private file-scope symbols as static
190
+ + diff.c: mark a private file-scope symbol as static
191
+ + commit.c: mark a file-scope private symbol as static
192
+ + builtin/notes.c: mark file-scope private symbols as static
193
194
+ Turn many file-scope private symbols to static to reduce the
195
+ global namespace contamination.
196
164
-* jk/config-warn-on-inaccessible-paths (2012-09-13) 1 commit
165
- (merged to 'next' on 2012-09-14 at a9bba78)
166
- + attr: failure to open a .gitattributes file is OK with ENOTDIR
197
168
- The attribute system may be asked for a path whose leading
169
- directories do not exist in the current working tree. In addition
170
- to ENOENT, ENOTDIR must be ignored.
198
+* aj/xfuncname-ada (2012-09-16) 1 commit
199
+ - Add userdiff patterns for Ada
200
+
201
+
202
+* aw/rebase-i-edit-todo (2012-09-16) 3 commits
203
+ - rebase -i: Add tests for "--edit-todo"
204
+ - rebase -i: Teach "--edit-todo" action
205
+ - rebase -i: Refactor help messages for todo file
206
+
207
+
208
+* jc/maint-mailinfo-mime-attr (2012-09-17) 1 commit
209
+ - mailinfo: do not concatenate charset= attribute values from mime headers
210
172
- Will merge to 'master' as part of the seventh batch.
211
+
212
+* js/poll-emu (2012-09-17) 4 commits
213
+ - make poll() work on platforms that can't recv() on a non-socket
214
+ - poll() exits too early with EFAULT if 1st arg is NULL
215
+ - fix some win32 specific dependencies in poll.c
216
+ - make poll available for other platforms lacking it
217
+
218
+
219
+* nd/wildmatch (2012-09-17) 5 commits
220
+ - Support "**" in .gitignore and .gitattributes patterns using wildmatch()
221
+ - Integrate wildmatch to git
222
+ - compat/wildmatch: fix case-insensitive matching
223
+ - compat/wildmatch: remove static variable force_lower_case
224
+ - Import wildmatch from rsync
225
226
--------------------------------------------------
227
[Stalled]
@@ -185,32 +237,6 @@ repositories listed at
237
and Win32 credential helpers.
238
239
188
-* jc/maint-name-rev (2012-09-04) 7 commits
189
- - describe --contains: use "name-rev --weight"
190
- - name-rev --weight: tests and documentation
191
- - name-rev --weight: cache the computed weight in notes
192
- - name-rev --weight: trivial optimization
193
- - name-rev: --weight option
194
- - name_rev: clarify the logic to assign a new tip-name to a commit
195
- - name-rev: lose unnecessary typedef
196
-
197
- "git name-rev" names the given revision based on a ref that can be
198
- reached in the smallest number of steps from the rev, but that is
199
- not useful when the caller wants to know which tag is the oldest one
200
- that contains the rev. This teaches a new mode to the command that
201
- uses the oldest ref among those which contain the rev.
202
-
203
- I am not sure if this is worth it; for one thing, even with the help
204
- from notes-cache, it seems to make the "describe --contains" even
205
- slower. Also the command will be unusably slow for a user who does
206
- not have a write access (hence unable to create or update the
207
- notes-cache).
208
-
209
- Needs another round to at least find a better name for the option,
210
- and possibly a cheaper but still better than the current "close to
211
- the tip" heuristics.
212
-
213
-
240
* ms/contrib-thunderbird-updates (2012-08-31) 2 commits
241
- [SQUASH] minimum fixup
242
- Thunderbird: fix appp.sh format problems
@@ -255,12 +281,6 @@ repositories listed at
281
Not ready.
282
283
258
-* er/doc-fast-import-done (2012-08-22) 1 commit
259
- - fast-import: document the --done option
260
-
261
- Parked in 'pu' in case ESR responds with "Sorry, forgot to sign-off".
262
-
263
-
284
* jc/add-delete-default (2012-08-13) 1 commit
285
- git add: notice removal of tracked paths by default
286
@@ -371,111 +391,103 @@ repositories listed at
391
--------------------------------------------------
392
[Cooking]
393
374
-* dg/run-command-child-cleanup (2012-09-11) 1 commit
375
- (merged to 'next' on 2012-09-12 at aa5f9e2)
376
- + run-command.c: fix broken list iteration in clear_child_for_cleanup
377
-
378
- The code to wait for subprocess and remove it from our internal queue
379
- wasn't quite right.
380
-
381
- Will merge to 'master' as part of the seventh batch.
382
-
383
-
384
-* jc/maint-blame-no-such-path (2012-09-11) 2 commits
385
- (merged to 'next' on 2012-09-14 at 84064d5)
386
- + blame: allow "blame file" in the middle of a conflicted merge
387
- + blame $path: avoid getting fooled by case insensitive filesystems
388
-
389
- "git blame MAKEFILE" run in a history that has "Makefile" but not
390
- "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
391
- confused on a case insensitive filesystem and failed to do so.
392
-
393
- Even during a conflicted merge, "git blame $path" always meant to
394
- blame uncommitted changes to the "working tree" version; make it
395
- more useful by showing cleanly merged parts as coming from the other
396
- branch that is being merged.
397
-
398
- Will merge to 'master' as part of the seventh batch.
399
-
400
-
401
-* sl/autoconf (2012-09-11) 2 commits
402
- (merged to 'next' on 2012-09-12 at 6ebe199)
403
- + build: don't duplicate substitution of make variables
404
- + build: improve GIT_CONF_SUBST signature
405
-
406
- Reduces repetition in configure.ac.
407
-
408
- Will merge to 'master' as part of the seventh batch.
409
-
410
-
411
-* cn/branch-set-upstream-to (2012-09-11) 2 commits
412
- (merged to 'next' on 2012-09-12 at e162318)
413
- + completion: complete branch name for "branch --set-upstream-to="
414
- + completion: add --set-upstream-to and --unset-upstream
394
+* jc/maint-name-rev (2012-09-17) 7 commits
395
+ - describe --contains: use "name-rev --algorithm=weight"
396
+ - name-rev --algorithm=weight: tests and documentation
397
+ - name-rev --algorithm=weight: cache the computed weight in notes
398
+ - name-rev --algorithm=weight: trivial optimization
399
+ - name-rev: --algorithm option
400
+ - name_rev: clarify the logic to assign a new tip-name to a commit
401
+ - name-rev: lose unnecessary typedef
402
416
- Finishing touches to the recently graduated topic to introduce
417
- "git branch --set-upstream-to" option.
403
+ "git name-rev" names the given revision based on a ref that can be
404
+ reached in the smallest number of steps from the rev, but that is
405
+ not useful when the caller wants to know which tag is the oldest one
406
+ that contains the rev. This teaches a new mode to the command that
407
+ uses the oldest ref among those which contain the rev.
408
419
- Will merge to 'master' as part of the seventh batch.
409
+ I am not sure if this is worth it; for one thing, even with the help
410
+ from notes-cache, it seems to make the "describe --contains" even
411
+ slower. Also the command will be unusably slow for a user who does
412
+ not have a write access (hence unable to create or update the
413
+ notes-cache).
414
415
422
-* jc/ll-merge-binary-ours (2012-09-12) 3 commits
423
- (merged to 'next' on 2012-09-12 at 9a7a6b3)
424
- + ll-merge: warn about inability to merge binary files only when we can't
425
- + attr: "binary" attribute should choose built-in "binary" merge driver
426
- + merge: teach -Xours/-Xtheirs to binary ll-merge driver
416
+* er/doc-fast-import-done (2012-08-22) 1 commit
417
+ (merged to 'next' on 2012-09-17 at bb8709a)
418
+ + fast-import: document the --done option
419
428
- "git merge -Xtheirs" did not help content-level merge of binary
429
- files; it should just take their version. Also "*.jpg binary" in
430
- the attributes did not imply they should use the binary ll-merge
431
- driver.
420
+ I got tired of waiting for ESR to respond with S-o-b for a trivial
421
+ documentation updates, so I'll be moving this forward.
422
433
- Will merge to 'master' as part of the seventh batch.
423
+ Will merge to 'master'.
424
425
436
-* jc/mailinfo-RE (2012-09-09) 1 commit
437
- (merged to 'next' on 2012-09-12 at 131edbf)
438
- + mailinfo: strip "RE: " prefix
426
+* nd/fetch-status-alignment (2012-09-14) 1 commit
427
+ (merged to 'next' on 2012-09-14 at 34237db)
428
+ + fetch: align per-ref summary report in UTF-8 locales
429
440
- We strip the prefix from "Re: subject" and also from a less common
441
- "re: subject", but left even less common "RE: subject" intact.
430
+ The status report from "git fetch", when messages like 'up-to-date'
431
+ are translated, did not align the branch names well.
432
443
- Will merge to 'master' as part of the seventh batch.
433
+ Will merge to 'master'.
434
435
446
-* mh/string-list (2012-09-12) 6 commits
447
- (merged to 'next' on 2012-09-14 at b4c50bc)
448
- + api-string-list.txt: initialize the string_list the easy way
449
- + string_list: add a function string_list_longest_prefix()
450
- + string_list: add a new function, string_list_remove_duplicates()
451
- + string_list: add a new function, filter_string_list()
452
- + string_list: add two new functions for splitting strings
453
- + string_list: add function string_list_append_nodup()
454
- (this branch is used by mh/fetch-filter-refs.)
436
+* mv/cherry-pick-s (2012-09-14) 1 commit
437
+ (merged to 'next' on 2012-09-14 at 2d143e1)
438
+ + cherry-pick: don't forget -s on failure
439
+
440
+ After "git cherry-pick -s" gave control back to the user asking
441
+ help to resolve conflicts, concluding "git commit" needs to be run
442
+ with "-s" if the user wants to sign it off, but people often forgot
443
+ to do so.
444
+
445
+ Will merge to 'master'.
446
+
447
+
448
+* jc/maint-log-grep-all-match (2012-09-15) 10 commits
449
+ (merged to 'next' on 2012-09-17 at 3c10a18)
450
+ + t7810-grep: test --all-match with multiple --grep and --author options
451
+ + t7810-grep: test interaction of multiple --grep and --author options
452
+ + t7810-grep: test multiple --author with --all-match
453
+ + t7810-grep: test multiple --grep with and without --all-match
454
+ + t7810-grep: bring log --grep tests in common form
455
+ (merged to 'next' on 2012-09-15 at 73fad40)
456
+ + grep.c: mark private file-scope symbols as static
457
+ (merged to 'next' on 2012-09-14 at 86b848c)
458
+ + log: document use of multiple commit limiting options
459
+ + log --grep/--author: honor --all-match honored for multiple --grep patterns
460
+ + grep: show --debug output only once
461
+ + grep: teach --debug option to dump the parse tree
462
456
- Will merge to 'master' as part of the seventh batch.
463
+ Fix a long-standing bug in "git log --grep" when multiple "--grep"
464
+ are used together with "--all-match" and "--author" or "--committer".
465
466
459
-* pw/p4-submit-conflicts (2012-09-10) 12 commits
460
- - git-p4: add submit --conflict option and config varaiable
461
- - git p4: add submit --prepare-p4-only option
462
- - git p4: add submit --dry-run option
463
- - git p4: accept -v for --verbose
464
- - git p4: revert deleted files after submit cancel
465
- - git p4: rearrange submit template construction
466
- - git p4: test clean-up after failed submit, fix added files
467
- - git p4: standardize submit cancel due to unchanged template
468
- - git p4: move conflict prompt into run, add [q]uit input
469
- - git p4: remove submit failure options [a]pply and [w]rite
470
- - git p4: gracefully fail if some commits could not be applied
471
- - git p4 test: remove bash-ism of combined export/assignment
467
+* pw/p4-submit-conflicts (2012-09-16) 12 commits
468
+ (merged to 'next' on 2012-09-17 at 7e57551)
469
+ + git-p4: add submit --conflict option and config varaiable
470
+ + git p4: add submit --prepare-p4-only option
471
+ + git p4: add submit --dry-run option
472
+ + git p4: accept -v for --verbose
473
+ + git p4: revert deleted files after submit cancel
474
+ + git p4: rearrange submit template construction
475
+ + git p4: test clean-up after failed submit, fix added files
476
+ + git p4: standardize submit cancel due to unchanged template
477
+ + git p4: move conflict prompt into run, add [q]uit input
478
+ + git p4: remove submit failure options [a]pply and [w]rite
479
+ + git p4: gracefully fail if some commits could not be applied
480
+ + git p4 test: remove bash-ism of combined export/assignment
481
473
- Waiting for comments.
482
+ Will merge to 'master'.
483
484
476
-* jc/xprm-generation (2012-09-04) 1 commit
485
+* jc/xprm-generation (2012-09-14) 1 commit
486
- test-generation: compute generation numbers and clock skews
487
488
+ A toy to analyze how bad the clock skews are in histories of real
489
+ world projects.
490
+
491
492
* rs/archive-zip-utf8 (2012-09-04) 1 commit
493
(merged to 'next' on 2012-09-11 at 3b1f071)
@@ -487,29 +499,6 @@ repositories listed at
499
Will merge to 'master' as part of the sixth batch.
500
501
490
-* mh/fetch-filter-refs (2012-09-12) 14 commits
491
- (merged to 'next' on 2012-09-14 at 567afe4)
492
- + fetch-pack: eliminate spurious error messages
493
- + cmd_fetch_pack(): simplify computation of return value
494
- + fetch-pack: report missing refs even if no existing refs were received
495
- + cmd_fetch_pack(): return early if finish_connect() fails
496
- + filter_refs(): simplify logic
497
- + filter_refs(): build refs list as we go
498
- + filter_refs(): delete matched refs from sought list
499
- + fetch_pack(): update sought->nr to reflect number of unique entries
500
- + filter_refs(): do not check the same sought_pos twice
501
- + Change fetch_pack() and friends to take string_list arguments
502
- + fetch_pack(): reindent function decl and defn
503
- + Rename static function fetch_pack() to http_fetch_pack()
504
- + t5500: add tests of fetch-pack --all --depth=N $URL $REF
505
- + t5500: add tests of error output for missing refs
506
- (this branch uses mh/string-list.)
507
-
508
- Code simplification and clarification.
509
-
510
- Will merge to 'master' as part of the seventh batch.
511
-
512
-
502
* jl/submodule-rm (2012-08-27) 1 commit
503
- Teach rm to remove submodules unless they contain a git directory
504