What's cooking (2012/09 #03)
Junio C Hamano committed
Sep 10, 2012 at 16:26 UTC
15663e26bafa3e02579b757a5a6f4ba7038d296c
1 file changed
+218
-369
whats-cooking.txt
+218
-369
@@ -1,16 +1,16 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2012, #02; Fri, 7)
4
-X-master-at: 0ce986446163b37c7f663ce7a408e7f94c31ba63
5
-X-next-at: 6ddb849836fa53f9ed36fe74e7f1caf18e635160
3
+Subject: What's cooking in git.git (Sep 2012, #03; Mon, 10)
4
+X-master-at: 682ce8bb37414afe87515123fc6c26f21dd35b15
5
+X-next-at: 5f38766e5791393ed68fd2877004482ad9e34352
6
7
-What's cooking in git.git (Sep 2012, #02; Fri, 7)
7
+What's cooking in git.git (Sep 2012, #03; Mon, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with '-' are
11
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
12
13
-The fourth batch of topics have graduated to 'master'.
13
+The fifth batch of topics have started graduating to 'master'.
14
15
I'm planning to keep this cycle reasonably short and aim for tagging
16
the result as 1.8.0 at the end of 9th week, on October 21st, after
@@ -22,259 +22,143 @@ repositories listed at
22
23
http://git-blame.blogspot.com/p/git-public-repositories.html
24
25
---------------------------------------------------
26
-[Graduated to "master"]
27
-
28
-* jc/apply-binary-p0 (2012-08-24) 1 commit
29
- (merged to 'next' on 2012-08-28 at 6fa690c)
30
- + apply: compute patch->def_name correctly under -p0
31
-
32
-"git apply -p0" did not parse pathnames on "diff --git" line
33
-correctly. This caused patches that had pathnames in no other
34
-places to be mistakenly rejected (most notably, binary patch that
35
-does not rename nor change mode). Textual patches, renames or
36
-mode changes have preimage and postimage pathnames in different
37
-places in a form that can be parsed unambiguously and did not suffer
38
-from this problem.
39
-
40
-* jc/dotdot-is-parent-directory (2012-08-23) 1 commit
41
- (merged to 'next' on 2012-08-28 at 2f2ae87)
42
- + specifying ranges: we did not mean to make ".." an empty set
43
-
44
-"git log .." errored out saying it is both rev range and a path when
45
-there is no disambiguating "--" is on the command line. Update the
46
-command line parser to interpret ".." as a path in such a case.
47
-
48
-* jc/maint-doc-checkout-b-always-takes-branch-name (2012-08-26) 1 commit
49
- (merged to 'next' on 2012-08-29 at e0d0f5c)
50
- + doc: "git checkout -b/-B/--orphan" always takes a branch name
51
-
52
-The synopsis said "checkout [-B branch]" to make it clear the branch
53
-name is a parameter to the option, but the heading for the option
54
-description was "-B::", not "-B branch::", making the documentation
55
-misleading. There may be room in documentation pages of other
56
-commands for similar improvements (hint, hint).
57
-
58
-* jk/config-warn-on-inaccessible-paths (2012-08-21) 4 commits
59
- (merged to 'next' on 2012-08-24 at 7470bd6)
60
- + warn_on_inaccessible(): a helper to warn on inaccessible paths
61
- + attr: warn on inaccessible attribute files
62
- + gitignore: report access errors of exclude files
63
- + config: warn on inaccessible files
64
-
65
-When looking for $HOME/.gitconfig etc., it is OK if we cannot read
66
-them because they do not exist, but we did not diagnose existing
67
-files that we cannot read.
68
-
69
-* jk/maint-http-half-auth-push (2012-08-27) 8 commits
70
- (merged to 'next' on 2012-08-29 at 0ed32f5)
71
- + http: prompt for credentials on failed POST
72
- + http: factor out http error code handling
73
- + t: test http access to "half-auth" repositories
74
- + t: test basic smart-http authentication
75
- + t/lib-httpd: recognize */smart/* repos as smart-http
76
- + t/lib-httpd: only route auth/dumb to dumb repos
77
- + t5550: factor out http auth setup
78
- + t5550: put auth-required repo in auth/dumb
79
-
80
-Pushing to smart HTTP server with recent Git fails without having
81
-the username in the URL to force authentication, if the server is
82
-configured to allow GET anonymously, while requiring authentication
83
-for POST.
84
-
85
-* kk/maint-for-each-ref-multi-sort (2012-08-21) 2 commits
86
- (merged to 'next' on 2012-08-24 at 28a5db4)
87
- + for-each-ref: Fix sort with multiple keys
88
- + t6300: test sort with multiple keys
89
-
90
-"git for-each-ref" did not currectly support more than one --sort
91
-option.
92
-
93
-* lt/commit-tree-guess-utf-8 (2012-08-21) 1 commit
94
- (merged to 'next' on 2012-08-24 at d16ac69)
95
- + commit/commit-tree: correct latin1 to utf-8
96
-
97
-Teaches "git commit" and "git commit-tree" the "we are told to use
98
-utf-8 in log message, but this does not look like utf-8---attempt to
99
-pass it through convert-from-latin1-to-utf8 and see if it makes
100
-sense" heuristics "git mailinfo" already uses.
101
-
102
-* nd/am-i18n-fix (2012-08-22) 1 commit
103
- (merged to 'next' on 2012-08-24 at f8e9a63)
104
- + am: quote string for translation before passing to eval_gettextln
105
-
106
-"git am" wasn't marked up for i18n properly.
107
-
108
-* nd/branch-v-alignment (2012-08-27) 1 commit
109
- (merged to 'next' on 2012-08-29 at 5c0d226)
110
- + branch -v: align even when branch names are in UTF-8
111
-
112
-Output from "git branch -v" contains "(no branch)" that could be
113
-localized, but the code to align it along with the names of branches
114
-were counting in bytes, not in display columns.
115
-
116
-* nd/i18n-parseopt-help (2012-08-22) 66 commits
117
- (merged to 'next' on 2012-08-24 at 2a04ce0)
118
- + Use imperative form in help usage to describe an action
119
- + Reduce translations by using same terminologies
120
- + i18n: write-tree: mark parseopt strings for translation
121
- + i18n: verify-tag: mark parseopt strings for translation
122
- + i18n: verify-pack: mark parseopt strings for translation
123
- + i18n: update-server-info: mark parseopt strings for translation
124
- + i18n: update-ref: mark parseopt strings for translation
125
- + i18n: update-index: mark parseopt strings for translation
126
- + i18n: tag: mark parseopt strings for translation
127
- + i18n: symbolic-ref: mark parseopt strings for translation
128
- + i18n: show-ref: mark parseopt strings for translation
129
- + i18n: show-branch: mark parseopt strings for translation
130
- + i18n: shortlog: mark parseopt strings for translation
131
- + i18n: rm: mark parseopt strings for translation
132
- + i18n: revert, cherry-pick: mark parseopt strings for translation
133
- + i18n: rev-parse: mark parseopt strings for translation
134
- + i18n: reset: mark parseopt strings for translation
135
- + i18n: rerere: mark parseopt strings for translation
136
- + i18n: status: mark parseopt strings for translation
137
- + i18n: replace: mark parseopt strings for translation
138
- + i18n: remote: mark parseopt strings for translation
139
- + i18n: read-tree: mark parseopt strings for translation
140
- + i18n: push: mark parseopt strings for translation
141
- + i18n: prune: mark parseopt strings for translation
142
- + i18n: prune-packed: mark parseopt strings for translation
143
- + i18n: pack-refs: mark parseopt strings for translation
144
- + i18n: pack-objects: mark parseopt strings for translation
145
- + i18n: notes: mark parseopt strings for translation
146
- + i18n: name-rev: mark parseopt strings for translation
147
- + i18n: mv: mark parseopt strings for translation
148
- + i18n: mktree: mark parseopt strings for translation
149
- + i18n: merge: mark parseopt strings for translation
150
- + i18n: merge-file: mark parseopt strings for translation
151
- + i18n: merge-base: mark parseopt strings for translation
152
- + i18n: ls-tree: mark parseopt strings for translation
153
- + i18n: ls-files: mark parseopt strings for translation
154
- + i18n: log: mark parseopt strings for translation
155
- + i18n: init-db: mark parseopt strings for translation
156
- + i18n: help: mark parseopt strings for translation
157
- + i18n: hash-object: mark parseopt strings for translation
158
- + i18n: grep: mark parseopt strings for translation
159
- + i18n: gc: mark parseopt strings for translation
160
- + i18n: fsck: mark parseopt strings for translation
161
- + i18n: format-patch: mark parseopt strings for translation
162
- + i18n: for-each-ref: mark parseopt strings for translation
163
- + i18n: fmt-merge-msg: mark parseopt strings for translation
164
- + i18n: fetch: mark parseopt strings for translation
165
- + i18n: fast-export: mark parseopt strings for translation
166
- + i18n: describe: mark parseopt strings for translation
167
- + i18n: config: mark parseopt strings for translation
168
- + i18n: count-objects: mark parseopt strings for translation
169
- + i18n: commit: mark parseopt strings for translation
170
- + i18n: column: mark parseopt strings for translation
171
- + i18n: clone: mark parseopt strings for translation
172
- + i18n: clean: mark parseopt strings for translation
173
- + i18n: cherry: mark parseopt strings for translation
174
- + i18n: checkout: mark parseopt strings for translation
175
- + i18n: checkout-index: mark parseopt strings for translation
176
- + i18n: check-attr: mark parseopt strings for translation
177
- + i18n: cat-file: mark parseopt strings for translation
178
- + i18n: branch: mark parseopt strings for translation
179
- + i18n: blame: mark parseopt strings for translation
180
- + i18n: add: mark parseopt strings for translation
181
- + i18n: bisect--helper: mark parseopt strings for translation
182
- + i18n: archive: mark parseopt strings for translation
183
- + i18n: mark "style" in OPT_COLUMN() for translation
184
-
185
-A lot of i18n mark-up for the help text from "git <cmd> -h".
186
-
187
-* nd/i18n-poison-test-updates (2012-08-27) 7 commits
188
- (merged to 'next' on 2012-08-29 at 9b7ff7f)
189
- + Fix tests under GETTEXT_POISON on parseopt
190
- + Fix tests under GETTEXT_POISON on git-remote
191
- + Fix tests under GETTEXT_POISON on pack-object
192
- + Fix tests under GETTEXT_POISON on git-apply
193
- + Fix tests under GETTEXT_POISON on diffstat
194
- + Fix tests under GETTEXT_POISON on git-stash
195
- + Fix tests under GETTEXT_POISON on relative dates
196
-
197
-Update tests that can be broken with gettext-poison builds.
198
-
199
-* pw/p4-use-client-spec-branch-detection (2012-08-20) 5 commits
200
- (merged to 'next' on 2012-08-24 at 08abc61)
201
- + git p4: make branch detection work with --use-client-spec
202
- + git p4: do wildcard decoding in stripRepoPath
203
- + git p4: set self.branchPrefixes in initialization
204
- + git p4 test: add broken --use-client-spec --detect-branches tests
205
- + git p4 test: move client_view() function to library
206
-
207
-Fixes "git p4" when "--use-client-spec" and "--detect-branches" are
208
-used together (the command used to misdetect branches).
209
-
210
-* tr/maint-parseopt-avoid-empty (2012-08-20) 1 commit
211
- (merged to 'next' on 2012-08-24 at cffa9a0)
212
- + gettext: do not translate empty string
213
-
214
-A workaround to avoid doing _(""), which translates to unwanted
215
-magic string in the .po files.
216
-
25
--------------------------------------------------
26
[New Topics]
27
220
-* kd/cvsimport-avoid-invalid-tag (2012-09-06) 1 commit
221
- - cvsimport: strip all inappropriate tag strings
222
-
223
-"cvsimport" tried to create a tag taken from CVS without
224
-sufficiently sanitizing it, causing the import to fail when an
225
-invalid character in the tagname made underlying "git tag" to fail.
28
+* jc/ll-merge-binary-ours (2012-09-08) 2 commits
29
+ - attr: "binary" attribute should choose built-in "binary" merge driver
30
+ - merge: teach -Xours/-Xtheirs to binary ll-merge driver
31
227
-Will merge to 'next'.
32
+"git merge -Xtheirs" did not help content-level merge of binary
33
+files; it should just take their version. Also "*.jpg binary" in
34
+the attributes did not imply they should use the binary ll-merge
35
+driver.
36
229
-* mh/abspath (2012-09-06) 8 commits
230
- - t0060: verify that real_path() removes extra slashes
231
- - real_path(): properly handle nonexistent top-level paths
232
- - t0060: verify that real_path() works correctly with absolute paths
233
- - real_path(): reject the empty string
234
- - t0060: verify that real_path() fails if passed the empty string
235
- - absolute_path(): reject the empty string
236
- - t0060: verify that absolute_path() fails if passed the empty string
237
- - t0060: move tests of real_path() from t0000 to here
37
+* jc/mailinfo-RE (2012-09-09) 1 commit
38
+ - mailinfo: strip "RE: " prefix
39
239
-* nd/i18n-status (2012-09-06) 1 commit
240
- - status: remove i18n legos
40
+We strip the prefix from "Re: subject" and also from a less common
41
+"re: subject", but left even less common "RE: subject" intact.
42
242
-Will merge to 'next'.
43
+* js/compat-mkdir (2012-09-08) 1 commit
44
+ - Document MKDIR_WO_TRAILING_SLASH in Makefile
45
244
-* nd/log-n-doc (2012-09-06) 1 commit
245
- - doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt
46
+Finishing touches to recently added wrapper for mkdir() that do not
47
+want to see trailing slashes.
48
49
Will merge to 'next'.
50
249
-* nd/maint-remote-remove (2012-09-06) 1 commit
250
- - remote: prefer subcommand name 'remove' to 'rm'
51
+* mh/string-list (2012-09-10) 6 commits
52
+ - api-string-list.txt: initialize the string_list the easy way
53
+ - string_list: add a function string_list_longest_prefix()
54
+ - string_list: add a new function, string_list_remove_duplicates()
55
+ - string_list: add a new function, filter_string_list()
56
+ - string_list: add two new functions for splitting strings
57
+ - string_list: add function string_list_append_nodup()
58
+ (this branch is used by mh/fetch-filter-refs.)
59
252
-Will merge to 'next'.
60
+--------------------------------------------------
61
+[Graduated to "master"]
62
254
-* sb/send-email-reconfirm-fix (2012-09-06) 1 commit
255
- - send-email: initial_to and initial_reply_to are both optional
63
+* cn/branch-set-upstream-to (2012-08-30) 3 commits
64
+ (merged to 'next' on 2012-08-31 at d550ecd)
65
+ + branch: deprecate --set-upstream and show help if we detect possible mistaken use
66
+ + branch: add --unset-upstream option
67
+ + branch: introduce --set-upstream-to
68
257
-Will merge to 'next'.
69
+"git branch --set-upstream origin/master" is a common mistake to
70
+create a local branch 'origin/master' and set it to integrate with
71
+the current branch. With a plan to deprecate this option, introduce
72
+"git branch (-u|--set-upstream-to) origin/master" that sets the
73
+current branch to integrate with 'origin/master' remote tracking
74
+branch.
75
259
-* sn/ls-remote-get-url-doc (2012-09-07) 1 commit
260
- - ls-remote: document the '--get-url' option
76
+* jk/maint-quiet-is-synonym-to-s-in-log (2012-08-28) 1 commit
77
+ (merged to 'next' on 2012-08-31 at 06f6953)
78
+ + log: fix --quiet synonym for -s
79
262
-Will merge to 'next'.
80
+We tried to bend backwards to allow "--quiet" to be a synonym as
81
+"-s" when given as e.g. "git show --quiet", but did not quite
82
+succeed.
83
264
-* dj/fetch-all-tags (2012-09-07) 1 commit
265
- - fetch --all: pass --tags/--no-tags through to each remote
266
- (this branch uses jk/argv-array.)
84
+* mz/cherry-pick-cmdline-order (2012-08-30) 3 commits
85
+ (merged to 'next' on 2012-08-31 at fc8eec4)
86
+ + cherry-pick/revert: respect order of revisions to pick
87
+ + demonstrate broken 'git cherry-pick three one two'
88
+ + teach log --no-walk=unsorted, which avoids sorting
89
268
-"git fetch --all", when passed "--no-tags", did not honor the
269
-"--no-tags" option while fetching from individual remotes (the same
270
-issue existed with "--tags", but combination "--all --tags" makes
271
-much less sense than "--all --no-tags").
90
+"git cherry-pick A C B" used to replay changes in A and then B and
91
+then C if these three commits had committer timestamps in that
92
+order, which is not what the user who said "A C B" naturally expects.
93
273
-Will merge to 'next'.
94
+* ph/credential-gnome-keyring (2012-08-24) 1 commit
95
+ (merged to 'next' on 2012-08-31 at 6f3b1de)
96
+ + contrib: add credential helper for GnomeKeyring
97
+ (this branch is used by ph/credential-refactor.)
98
+
99
+The later refactoring of the shared code in the original series may
100
+not be worth the trouble, so it is split into a separate topic that
101
+builds on top of this one, which independently should be useful.
102
103
--------------------------------------------------
104
[Stalled]
105
106
+* ph/credential-refactor (2012-09-02) 5 commits
107
+ - wincred: port to generic credential helper
108
+ - Merge branch 'ef/win32-cred-helper' into ph/credential-refactor
109
+ - osxkeychain: port to generic credential helper implementation
110
+ - gnome-keyring: port to generic helper implementation
111
+ - contrib: add generic credential helper
112
+
113
+Attempts to refactor to share code among OSX keychain, Gnome keyring
114
+and Win32 credential helpers.
115
+
116
+* jc/maint-name-rev (2012-09-04) 7 commits
117
+ - describe --contains: use "name-rev --weight"
118
+ - name-rev --weight: tests and documentation
119
+ - name-rev --weight: cache the computed weight in notes
120
+ - name-rev --weight: trivial optimization
121
+ - name-rev: --weight option
122
+ - name_rev: clarify the logic to assign a new tip-name to a commit
123
+ - name-rev: lose unnecessary typedef
124
+
125
+"git name-rev" names the given revision based on a ref that can be
126
+reached in the smallest number of steps from the rev, but that is
127
+not useful when the caller wants to know which tag is the oldest one
128
+that contains the rev. This teaches a new mode to the command that
129
+uses the oldest ref among those which contain the rev.
130
+
131
+I am not sure if this is worth it; for one thing, even with the help
132
+from notes-cache, it seems to make the "describe --contains" even
133
+slower. Also the command will be unusably slow for a user who does
134
+not have a write access (hence unable to create or update the
135
+notes-cache).
136
+
137
+Needs another round to at least find a better name for the option,
138
+and possibly a cheaper but still better than the current "close to
139
+the tip" heuristics.
140
+
141
+* ms/contrib-thunderbird-updates (2012-08-31) 2 commits
142
+ - [SQUASH] minimum fixup
143
+ - Thunderbird: fix appp.sh format problems
144
+
145
+Update helper to send out format-patch output using Thunderbird.
146
+Seems to have design regression for silent users.
147
+
148
+* as/check-ignore (2012-09-02) 10 commits
149
+ . fixup: decl-after-stmt etc.
150
+ . Add git-check-ignore
151
+ . Provide free_directory() for reclaiming dir_struct memory
152
+ . Extract some useful pathspec handling code from builtin/add.c into a library
153
+ . For each exclude pattern, store information about where it came from
154
+ . dir.c: refactor excluded() and path_excluded()
155
+ . dir.c: refactor excluded_from_list()
156
+ . dir.c: rename cryptic 'which' variable to more consistent name
157
+ . Improve documentation and comments regarding directory traversal API
158
+ . Update directory listing API doc to match code
159
+
160
+Will be rerolled.
161
+
162
* jx/test-real-path (2012-08-27) 1 commit
163
- test: set the realpath of CWD as TRASH_DIRECTORY
164
@@ -335,22 +219,6 @@ A GSoC project. Was waiting for comments from mentors and
219
stakeholders, but nothing seems to be happening, other than breakage
220
fixes on Cygwin. May discard.
221
338
-* pw/p4-submit-conflicts (2012-08-16) 12 commits
339
- - git p4: add submit --prepare-p4-only option
340
- - git p4: add submit --dry-run option
341
- - git p4: accept -v for --verbose
342
- - git p4: revert deleted files after submit cancel
343
- - git p4: rearrange submit template construction
344
- - git p4: test clean-up after failed submit, fix added files
345
- - git p4: standardize submit cancel due to unchanged template
346
- - git p4: move conflict prompt into run, use [c]ontinue and [q]uit
347
- - git p4: remove submit failure options [a]pply and [w]rite
348
- - git p4: gracefully fail if some commits could not be applied
349
- - git p4 test: use p4d -L option to suppress log messages
350
- - git p4 test: remove bash-ism of combined export/assignment
351
-
352
-Waiting for the dust to settle.
353
-
222
* mz/rebase-range (2012-07-18) 7 commits
223
. rebase (without -p): correctly calculate patches to rebase
224
. rebase -p: don't request --left-right only to ignore left side
@@ -415,19 +283,81 @@ working :-<.
283
--------------------------------------------------
284
[Cooking]
285
418
-* as/check-ignore (2012-09-02) 10 commits
419
- . fixup: decl-after-stmt etc.
420
- . Add git-check-ignore
421
- . Provide free_directory() for reclaiming dir_struct memory
422
- . Extract some useful pathspec handling code from builtin/add.c into a library
423
- . For each exclude pattern, store information about where it came from
424
- . dir.c: refactor excluded() and path_excluded()
425
- . dir.c: refactor excluded_from_list()
426
- . dir.c: rename cryptic 'which' variable to more consistent name
427
- . Improve documentation and comments regarding directory traversal API
428
- . Update directory listing API doc to match code
286
+* pw/p4-submit-conflicts (2012-09-10) 12 commits
287
+ - git-p4: add submit --conflict option and config varaiable
288
+ - git p4: add submit --prepare-p4-only option
289
+ - git p4: add submit --dry-run option
290
+ - git p4: accept -v for --verbose
291
+ - git p4: revert deleted files after submit cancel
292
+ - git p4: rearrange submit template construction
293
+ - git p4: test clean-up after failed submit, fix added files
294
+ - git p4: standardize submit cancel due to unchanged template
295
+ - git p4: move conflict prompt into run, add [q]uit input
296
+ - git p4: remove submit failure options [a]pply and [w]rite
297
+ - git p4: gracefully fail if some commits could not be applied
298
+ - git p4 test: remove bash-ism of combined export/assignment
299
430
-Will be rerolled.
300
+Rerolled.
301
+
302
+Waiting for comments.
303
+
304
+* kd/cvsimport-avoid-invalid-tag (2012-09-06) 1 commit
305
+ - cvsimport: strip all inappropriate tag strings
306
+
307
+"cvsimport" tried to create a tag taken from CVS without
308
+sufficiently sanitizing it, causing the import to fail when an
309
+invalid character in the tagname made underlying "git tag" to fail.
310
+
311
+Will merge to 'next'.
312
+
313
+* mh/abspath (2012-09-10) 9 commits
314
+ - t0060: split absolute path test in two to exercise some of it on Windows
315
+ - t0060: verify that real_path() removes extra slashes
316
+ - real_path(): properly handle nonexistent top-level paths
317
+ - t0060: verify that real_path() works correctly with absolute paths
318
+ - real_path(): reject the empty string
319
+ - t0060: verify that real_path() fails if passed the empty string
320
+ - absolute_path(): reject the empty string
321
+ - t0060: verify that absolute_path() fails if passed the empty string
322
+ - t0060: move tests of real_path() from t0000 to here
323
+
324
+Will merge to 'next'.
325
+
326
+* nd/i18n-status (2012-09-06) 1 commit
327
+ - status: remove i18n legos
328
+
329
+Will merge to 'next'.
330
+
331
+* nd/log-n-doc (2012-09-06) 1 commit
332
+ - doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt
333
+
334
+Will merge to 'next'.
335
+
336
+* nd/maint-remote-remove (2012-09-06) 1 commit
337
+ - remote: prefer subcommand name 'remove' to 'rm'
338
+
339
+Will merge to 'next'.
340
+
341
+* sb/send-email-reconfirm-fix (2012-09-06) 1 commit
342
+ - send-email: initial_to and initial_reply_to are both optional
343
+
344
+Will merge to 'next'.
345
+
346
+* sn/ls-remote-get-url-doc (2012-09-07) 1 commit
347
+ - ls-remote: document the '--get-url' option
348
+
349
+Will merge to 'next'.
350
+
351
+* dj/fetch-all-tags (2012-09-07) 1 commit
352
+ - fetch --all: pass --tags/--no-tags through to each remote
353
+ (this branch uses jk/argv-array.)
354
+
355
+"git fetch --all", when passed "--no-tags", did not honor the
356
+"--no-tags" option while fetching from individual remotes (the same
357
+issue existed with "--tags", but combination "--all --tags" makes
358
+much less sense than "--all --no-tags").
359
+
360
+Will merge to 'next'.
361
362
* jc/maint-ident-missing-human-name (2012-08-31) 1 commit
363
(merged to 'next' on 2012-09-07 at 0e99b20)
@@ -470,10 +400,13 @@ using it on their platform.
400
401
Will merge to 'master' as part of the fifth batch.
402
473
-* jc/maint-checkout-fileglob-doc (2012-09-07) 2 commits
403
+* jc/maint-checkout-fileglob-doc (2012-09-10) 3 commits
404
- gitcli: contrast wildcard given to shell and to git
405
+ - gitcli: formatting fix
406
- Document file-glob for "git checkout -- '*.c'"
407
408
+Updated with help from Peff.
409
+
410
Will merge to 'next'.
411
412
* jc/xprm-generation (2012-09-04) 1 commit
@@ -486,38 +419,12 @@ Will merge to 'next'.
419
- path.c: Don't discard the return value of vsnpath()
420
- path.c: Remove the 'git_' prefix from a file scope function
421
422
+Will merge to 'next'.
423
+
424
* rs/archive-zip-utf8 (2012-09-04) 1 commit
425
- archive-zip: support UTF-8 paths
426
492
-* mz/cherry-pick-cmdline-order (2012-08-30) 3 commits
493
- (merged to 'next' on 2012-08-31 at fc8eec4)
494
- + cherry-pick/revert: respect order of revisions to pick
495
- + demonstrate broken 'git cherry-pick three one two'
496
- + teach log --no-walk=unsorted, which avoids sorting
497
-
498
-"git cherry-pick A C B" used to replay changes in A and then B and
499
-then C if these three commits had committer timestamps in that
500
-order, which is not what the user who said "A C B" naturally expects.
501
-
502
-Will merge to 'master' as part of the fifth batch.
503
-
504
-* ph/credential-gnome-keyring (2012-08-24) 1 commit
505
- (merged to 'next' on 2012-08-31 at 6f3b1de)
506
- + contrib: add credential helper for GnomeKeyring
507
- (this branch is used by ph/credential-refactor.)
508
-
509
-The later refactoring of the shared code in the original series may
510
-not be worth the trouble, so it is split into a separate topic that
511
-builds on top of this one, which independently should be useful.
512
-
513
-Will merge to 'master' as part of the fifth batch.
514
-
515
-* ms/contrib-thunderbird-updates (2012-08-31) 2 commits
516
- - [SQUASH] minimum fixup
517
- - Thunderbird: fix appp.sh format problems
518
-
519
-Update helper to send out format-patch output using Thunderbird.
520
-Seems to have design regression for silent users.
427
+Will merge to 'next'.
428
429
* nd/i18n-index-pack (2012-08-31) 1 commit
430
(merged to 'next' on 2012-09-07 at bbcece1)
@@ -525,16 +432,6 @@ Seems to have design regression for silent users.
432
433
Will merge to 'master' as part of the fifth batch.
434
528
-* jk/maint-quiet-is-synonym-to-s-in-log (2012-08-28) 1 commit
529
- (merged to 'next' on 2012-08-31 at 06f6953)
530
- + log: fix --quiet synonym for -s
531
-
532
-We tried to bend backwards to allow "--quiet" to be a synonym as
533
-"-s" when given as e.g. "git show --quiet", but did not quite
534
-succeed.
535
-
536
-Will merge to 'master' as part of the fifth batch.
537
-
435
* nd/checkout-option-parsing-fix (2012-09-07) 4 commits
436
- fixup! checkout: reorder option handling
437
- checkout: reorder option handling
@@ -550,83 +447,33 @@ for a branch).
447
448
Will merge to 'next' after squashing the tip two.
449
553
-* jc/maint-name-rev (2012-09-04) 7 commits
554
- - describe --contains: use "name-rev --weight"
555
- - name-rev --weight: tests and documentation
556
- - name-rev --weight: cache the computed weight in notes
557
- - name-rev --weight: trivial optimization
558
- - name-rev: --weight option
559
- - name_rev: clarify the logic to assign a new tip-name to a commit
560
- - name-rev: lose unnecessary typedef
561
-
562
-"git name-rev" names the given revision based on a ref that can be
563
-reached in the smallest number of steps from the rev, but that is
564
-not useful when the caller wants to know which tag is the oldest one
565
-that contains the rev. This teaches a new mode to the command that
566
-uses the oldest ref among those which contain the rev.
567
-
568
-I am not sure if this is worth it; for one thing, even with the help
569
-from notes-cache, it seems to make the "describe --contains" even
570
-slower. Also the command will be unusably slow for a user who does
571
-not have a write access (hence unable to create or update the
572
-notes-cache).
573
-
574
-Needs another round to at least find a better name for the option,
575
-and possibly a cheaper but still better than the current "close to
576
-the tip" heuristics.
577
-
578
-* cn/branch-set-upstream-to (2012-08-30) 3 commits
579
- (merged to 'next' on 2012-08-31 at d550ecd)
580
- + branch: deprecate --set-upstream and show help if we detect possible mistaken use
581
- + branch: add --unset-upstream option
582
- + branch: introduce --set-upstream-to
583
-
584
-"git branch --set-upstream origin/master" is a common mistake to
585
-create a local branch 'origin/master' and set it to integrate with
586
-the current branch. With a plan to deprecate this option, introduce
587
-"git branch (-u|--set-upstream-to) origin/master" that sets the
588
-current branch to integrate with 'origin/master' remote tracking
589
-branch.
590
-
591
-Will merge to 'master' as part of the fifth batch.
592
-
593
-* js/compat-itimer (2012-08-24) 1 commit
594
- - Support for setitimer() on platforms lacking it
450
+* js/compat-itimer (2012-09-08) 1 commit
451
+ - Add a no-op setitimer() wrapper
452
453
Pieces to support compilation on __TANDEM.
454
598
-* ph/credential-refactor (2012-09-02) 5 commits
599
- - wincred: port to generic credential helper
600
- - Merge branch 'ef/win32-cred-helper' into ph/credential-refactor
601
- - osxkeychain: port to generic credential helper implementation
602
- - gnome-keyring: port to generic helper implementation
603
- - contrib: add generic credential helper
604
- (this branch uses ph/credential-gnome-keyring.)
605
-
606
-Attempts to refactor to share code among OSX keychain, Gnome keyring
607
-and Win32 credential helpers.
455
+Will merge to 'next'.
456
609
-* mh/fetch-filter-refs (2012-08-26) 17 commits
610
- - filter_refs(): simplify logic
611
- - fetch_pack(): free matching heads
457
+* mh/fetch-filter-refs (2012-09-10) 14 commits
458
+ - fetch-pack: eliminate spurious error messages
459
- cmd_fetch_pack(): simplify computation of return value
460
- fetch-pack: report missing refs even if no existing refs were received
614
- - cmd_fetch_pack: return early if finish_connect() returns an error
615
- - filter_refs(): compress unmatched refs in heads array
616
- - filter_refs(): do not leave gaps in return_refs
617
- - filter_refs(): simplify by removing optimization
618
- - Pass nr_heads to filter_refs() by reference
619
- - Pass nr_heads to everything_local() by reference
620
- - Pass nr_heads to do_pack_ref() by reference
621
- - Let fetch_pack() inform caller about number of unique heads
622
- - filter_refs(): do not check the same head_pos twice
623
- - fetch-pack.c: name local variables more consistently
461
+ - cmd_fetch_pack(): return early if finish_connect() fails
462
+ - filter_refs(): simplify logic
463
+ - filter_refs(): build refs list as we go
464
+ - filter_refs(): delete matched refs from sought list
465
+ - fetch_pack(): update sought->nr to reflect number of unique entries
466
+ - filter_refs(): do not check the same sought_pos twice
467
+ - Change fetch_pack() and friends to take string_list arguments
468
- fetch_pack(): reindent function decl and defn
469
- Rename static function fetch_pack() to http_fetch_pack()
470
+ - t5500: add tests of fetch-pack --all --depth=N $URL $REF
471
- t5500: add tests of error output for missing refs
472
+ (this branch uses mh/string-list.)
473
474
Code simplification and clarification.
629
-Waiting for a follow-up patch based on Peff's idea.
475
+
476
+Waiting for the mh/string-list to settle.
477
478
* jc/merge-bases (2012-08-31) 9 commits
479
(merged to 'next' on 2012-09-07 at ab0974d)
@@ -657,6 +504,8 @@ no local changes in the submodule working tree, and its repository
504
is not embedded in its working tree but is elsewhere and uses the
505
gitfile mechanism to point at it.
506
507
+I lost track; what is the doneness of the discussion on this patch?
508
+
509
* fa/remote-svn (2012-08-28) 16 commits
510
- Add a test script for remote-svn
511
- remote-svn: add marks-file regeneration