What's cooking (2012/09 #02)
Junio C Hamano committed
Sep 7, 2012 at 14:54 UTC
75ea0daf69c23ce53cc8f8abdb1dbefbd4fd246b
1 file changed
+299
-349
whats-cooking.txt
+299
-349
@@ -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, #01; Tue, 4)
4
-X-master-at: 3fc0e4ca00330ce1dfd92baeda04f0aa2fbd7e68
5
-X-next-at: cfd4979c8f619202e04abe06b9cd742131d3422b
3
+Subject: What's cooking in git.git (Sep 2012, #02; Fri, 7)
4
+X-master-at: 0ce986446163b37c7f663ce7a408e7f94c31ba63
5
+X-next-at: 6ddb849836fa53f9ed36fe74e7f1caf18e635160
6
7
-What's cooking in git.git (Sep 2012, #01; Tue, 4)
7
+What's cooking in git.git (Sep 2012, #02; Fri, 7)
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 third batch of topics have graduated to 'master'.
13
+The fourth batch of topics have graduated 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
@@ -25,163 +25,252 @@ repositories listed at
25
--------------------------------------------------
26
[Graduated to "master"]
27
28
-* cw/cherry-pick-allow-empty-message (2012-08-06) 1 commit
29
- (merged to 'next' on 2012-08-20 at 0dc0590)
30
- + cherry-pick: add --allow-empty-message option
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
-(Originally merged to 'next' on 2012-08-09)
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
34
-"git cherry-pick" by default stops when it sees a commit without any
35
-log message. The "--allow-empty-message" option can be used to
36
-silently proceed.
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
38
-* jc/daemon-access-hook (2012-08-15) 1 commit
39
- (merged to 'next' on 2012-08-20 at c8f5b2e)
40
- + daemon: --access-hook option
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
42
-Allow an external command to tell git-daemon to decline service
43
-based on the client address, repository path, etc.
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
45
-* jc/maint-config-exit-status (2012-07-30) 1 commit
46
- (merged to 'next' on 2012-08-20 at e18ddd8)
47
- + config: "git config baa" should exit with status 1
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
49
-(Originally merged to 'next' on 2012-07-30)
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
51
-The exit status code from "git config" was way overspecified while
52
-being incorrect. Update the implementation to give the documented
53
-status for a case that was documented, and introduce a new code for
54
-"all other errors".
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
56
-* jc/maint-mergetool-style-fix (2012-08-23) 1 commit
57
- (merged to 'next' on 2012-08-28 at ced5868)
58
- + mergetool: style fixes
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
60
-* jc/maint-sane-execvp-notdir (2012-07-31) 1 commit
61
- (merged to 'next' on 2012-08-20 at 0d76cf2)
62
- + sane_execvp(): ignore non-directory on $PATH
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
64
-(Originally merged to 'next' on 2012-08-09)
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
66
-"git foo" errored out with "Not a directory" when the user had a non
67
-directory on $PATH, and worse yet it masked an alias "foo" to run.
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
69
-* jc/send-email-reconfirm (2012-08-14) 1 commit
70
- (merged to 'next' on 2012-08-20 at dffdef6)
71
- + send-email: validate & reconfirm interactive responses
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
73
-Validate interactive input to "git send-email" to avoid common
74
-mistakes such as saying "y<RETURN>" to sender mail address whose
75
-prompt is given with a correctly guessed default.
106
+"git am" wasn't marked up for i18n properly.
107
77
-* js/compat-mkdir (2012-08-24) 1 commit
78
- (merged to 'next' on 2012-08-28 at e92bf74)
79
- + compat: some mkdir() do not like a slash at the end
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
81
-Some mkdir(2) implementations do not want to see trailing slash in
82
-its parameter.
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
84
-* js/no-curl-easy-strerror-on-old-curl (2012-08-23) 1 commit
85
- (merged to 'next' on 2012-08-28 at 25e2e7a)
86
- + http.c: don't use curl_easy_strerror prior to curl-7.12.0
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
88
-Done to support compilation on __TANDEM, but is independently useful
89
-for people with older version of libcURL.
185
+A lot of i18n mark-up for the help text from "git <cmd> -h".
186
91
-* js/use-sc-open-max (2012-08-24) 1 commit
92
- (merged to 'next' on 2012-08-28 at 8b9ac7c)
93
- + sha1_file.c: introduce get_max_fd_limit() helper
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
95
-Introduce get_max_fd_limit() to absorb platforms that do not have
96
-getrlimit(RLIMIT_NOFILE) and/or sysconf(_SC_OPEN_MAX).
197
+Update tests that can be broken with gettext-poison builds.
198
98
-* ph/stash-rerere (2012-08-17) 2 commits
99
- (merged to 'next' on 2012-08-20 at ae37111)
100
- + stash: invoke rerere in case of conflict
101
- + test: git-stash conflict sets up rerere
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
103
-"git stash" internally used "git merge-recursive" backend, which did
104
-not trigger "rerere" upon conflicts unlike other mergy operations.
207
+Fixes "git p4" when "--use-client-spec" and "--detect-branches" are
208
+used together (the command used to misdetect branches).
209
106
-* sz/submodule-force-update (2012-08-24) 1 commit
107
- (merged to 'next' on 2012-08-24 at f82b466)
108
- + Make 'git submodule update --force' always check out submodules.
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
110
-"git submodule update --force" used to leave the working tree of the
111
-submodule intact when there were local changes. It is more intiutive
112
-to make "--force" a sign to run "checkout -f" to overwrite them.
214
+A workaround to avoid doing _(""), which translates to unwanted
215
+magic string in the .po files.
216
217
--------------------------------------------------
218
[New Topics]
219
117
-* as/check-ignore (2012-09-02) 10 commits
118
- . fixup: decl-after-stmt etc.
119
- . Add git-check-ignore
120
- . Provide free_directory() for reclaiming dir_struct memory
121
- . Extract some useful pathspec handling code from builtin/add.c into a library
122
- . For each exclude pattern, store information about where it came from
123
- . dir.c: refactor excluded() and path_excluded()
124
- . dir.c: refactor excluded_from_list()
125
- . dir.c: rename cryptic 'which' variable to more consistent name
126
- . Improve documentation and comments regarding directory traversal API
127
- . Update directory listing API doc to match code
220
+* kd/cvsimport-avoid-invalid-tag (2012-09-06) 1 commit
221
+ - cvsimport: strip all inappropriate tag strings
222
129
-Queued, but I think the design of the end-user experience needs to
130
-be discussed further to polish this topic.
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.
226
132
-* jc/maint-ident-missing-human-name (2012-08-31) 1 commit
133
- - split_ident_line(): make best effort when parsing author/committer line
227
+Will merge to 'next'.
228
135
-"git show --format='%ci'" did not give timestamp correctly for
136
-commits created without human readable name on "committer" line.
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
238
138
-Will merge to 'next' after eyeballing one more time.
239
+* nd/i18n-status (2012-09-06) 1 commit
240
+ - status: remove i18n legos
241
140
-* jk/argv-array (2012-09-02) 4 commits
141
- - submodule: use argv_array instead of hand-building arrays
142
- - fetch: use argv_array instead of hand-building arrays
143
- - argv-array: fix bogus cast when freeing array
144
- - argv-array: add pop function
242
+Will merge to 'next'.
243
146
-Use argv-array API in "git fetch" implementation.
147
-Will merge to 'next' after eyeballing one more time.
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
246
149
-* rj/tap-fix (2012-09-02) 6 commits
150
- - test-lib.sh: Suppress the "passed all ..." message if no tests run
151
- - test-lib.sh: Add check for invalid use of 'skip_all' facility
152
- - test-lib.sh: Fix some shell coding style violations
153
- - t4016-*.sh: Skip all tests rather than each test
154
- - t3902-*.sh: Skip all tests rather than each test
155
- - t3300-*.sh: Fix a TAP parse error
247
+Will merge to 'next'.
248
157
-Will merge to 'next' after eyeballing one more time.
249
+* nd/maint-remote-remove (2012-09-06) 1 commit
250
+ - remote: prefer subcommand name 'remove' to 'rm'
251
159
-* rj/test-regex (2012-09-02) 1 commit
160
- - test-regex: Add a test to check for a bug in the regex routines
252
+Will merge to 'next'.
253
162
-Git ships with a fall-back regexp implementation for platforms with
163
-buggy regexp library; give people a tool to see if they should be
164
-using it on their platform.
254
+* sb/send-email-reconfirm-fix (2012-09-06) 1 commit
255
+ - send-email: initial_to and initial_reply_to are both optional
256
166
-Will merge to 'next' after eyeballing one more time.
257
+Will merge to 'next'.
258
168
-* jc/maint-checkout-fileglob-doc (2012-09-04) 1 commit
169
- - Document file-glob for "git checkout -- '*.c'"
259
+* sn/ls-remote-get-url-doc (2012-09-07) 1 commit
260
+ - ls-remote: document the '--get-url' option
261
171
-Will merge to 'next' after eyeballing one more time.
262
+Will merge to 'next'.
263
173
-* jc/xprm-generation (2012-09-04) 1 commit
174
- - test-generation: compute generation numbers and clock skews
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.)
267
176
-* rj/path-cleanup (2012-09-04) 5 commits
177
- - Call mkpathdup() rather than xstrdup(mkpath(...))
178
- - Call git_pathdup() rather than xstrdup(git_path("..."))
179
- - path.c: Use vsnpath() in the implementation of git_path()
180
- - path.c: Don't discard the return value of vsnpath()
181
- - path.c: Remove the 'git_' prefix from a file scope function
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").
272
183
-* rs/archive-zip-utf8 (2012-09-04) 1 commit
184
- - archive-zip: support UTF-8 paths
273
+Will merge to 'next'.
274
275
--------------------------------------------------
276
[Stalled]
@@ -326,6 +415,80 @@ working :-<.
415
--------------------------------------------------
416
[Cooking]
417
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
429
+
430
+Will be rerolled.
431
+
432
+* jc/maint-ident-missing-human-name (2012-08-31) 1 commit
433
+ (merged to 'next' on 2012-09-07 at 0e99b20)
434
+ + split_ident_line(): make best effort when parsing author/committer line
435
+
436
+"git show --format='%ci'" did not give timestamp correctly for
437
+commits created without human readable name on "committer" line.
438
+
439
+Will merge to 'master' as part of the fifth batch.
440
+
441
+* jk/argv-array (2012-09-02) 4 commits
442
+ (merged to 'next' on 2012-09-07 at 98dbd14)
443
+ + submodule: use argv_array instead of hand-building arrays
444
+ + fetch: use argv_array instead of hand-building arrays
445
+ + argv-array: fix bogus cast when freeing array
446
+ + argv-array: add pop function
447
+ (this branch is used by dj/fetch-all-tags.)
448
+
449
+Use argv-array API in "git fetch" implementation.
450
+
451
+Will merge to 'master' as part of the fifth batch.
452
+
453
+* rj/tap-fix (2012-09-02) 6 commits
454
+ - test-lib.sh: Suppress the "passed all ..." message if no tests run
455
+ - test-lib.sh: Add check for invalid use of 'skip_all' facility
456
+ - test-lib.sh: Fix some shell coding style violations
457
+ - t4016-*.sh: Skip all tests rather than each test
458
+ - t3902-*.sh: Skip all tests rather than each test
459
+ - t3300-*.sh: Fix a TAP parse error
460
+
461
+Will merge to 'next'.
462
+
463
+* rj/test-regex (2012-09-02) 1 commit
464
+ (merged to 'next' on 2012-09-07 at e7e3527)
465
+ + test-regex: Add a test to check for a bug in the regex routines
466
+
467
+Git ships with a fall-back regexp implementation for platforms with
468
+buggy regexp library; give people a tool to see if they should be
469
+using it on their platform.
470
+
471
+Will merge to 'master' as part of the fifth batch.
472
+
473
+* jc/maint-checkout-fileglob-doc (2012-09-07) 2 commits
474
+ - gitcli: contrast wildcard given to shell and to git
475
+ - Document file-glob for "git checkout -- '*.c'"
476
+
477
+Will merge to 'next'.
478
+
479
+* jc/xprm-generation (2012-09-04) 1 commit
480
+ - test-generation: compute generation numbers and clock skews
481
+
482
+* rj/path-cleanup (2012-09-04) 5 commits
483
+ - Call mkpathdup() rather than xstrdup(mkpath(...))
484
+ - Call git_pathdup() rather than xstrdup(git_path("..."))
485
+ - path.c: Use vsnpath() in the implementation of git_path()
486
+ - path.c: Don't discard the return value of vsnpath()
487
+ - path.c: Remove the 'git_' prefix from a file scope function
488
+
489
+* rs/archive-zip-utf8 (2012-09-04) 1 commit
490
+ - archive-zip: support UTF-8 paths
491
+
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
@@ -357,9 +520,10 @@ Update helper to send out format-patch output using Thunderbird.
520
Seems to have design regression for silent users.
521
522
* nd/i18n-index-pack (2012-08-31) 1 commit
360
- - i18n: mark more index-pack strings for translation
523
+ (merged to 'next' on 2012-09-07 at bbcece1)
524
+ + i18n: mark more index-pack strings for translation
525
362
-Will merge to 'next'.
526
+Will merge to 'master' as part of the fifth batch.
527
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)
@@ -371,7 +535,8 @@ succeed.
535
536
Will merge to 'master' as part of the fifth batch.
537
374
-* nd/checkout-option-parsing-fix (2012-08-30) 3 commits
538
+* nd/checkout-option-parsing-fix (2012-09-07) 4 commits
539
+ - fixup! checkout: reorder option handling
540
- checkout: reorder option handling
541
- checkout: move more parameters to struct checkout_opts
542
- checkout: pass "struct checkout_opts *" as const pointer
@@ -383,7 +548,7 @@ Reorganize the code and allow giving a proper diagnosis when the
548
user says "git checkout -b -t foo bar" (e.g. "-t" is not a good name
549
for a branch).
550
386
-Will merge to 'next' after eyeballing one more time.
551
+Will merge to 'next' after squashing the tip two.
552
553
* jc/maint-name-rev (2012-09-04) 7 commits
554
- describe --contains: use "name-rev --weight"
@@ -425,16 +590,6 @@ branch.
590
591
Will merge to 'master' as part of the fifth batch.
592
428
-* jc/dotdot-is-parent-directory (2012-08-23) 1 commit
429
- (merged to 'next' on 2012-08-28 at 2f2ae87)
430
- + specifying ranges: we did not mean to make ".." an empty set
431
-
432
-"git log .." errored out saying it is both rev range and a path when
433
-there is no disambiguating "--" is on the command line. Update the
434
-command line parser to interpret ".." as a path in such a case.
435
-
436
-Will merge to 'master' as part of the fourth batch.
437
-
593
* js/compat-itimer (2012-08-24) 1 commit
594
- Support for setitimer() on platforms lacking it
595
@@ -451,50 +606,6 @@ Pieces to support compilation on __TANDEM.
606
Attempts to refactor to share code among OSX keychain, Gnome keyring
607
and Win32 credential helpers.
608
454
-* jc/apply-binary-p0 (2012-08-24) 1 commit
455
- (merged to 'next' on 2012-08-28 at 6fa690c)
456
- + apply: compute patch->def_name correctly under -p0
457
-
458
-"git apply -p0" did not parse pathnames on "diff --git" line
459
-correctly. This caused patches that had pathnames in no other
460
-places to be mistakenly rejected (most notably, binary patch that
461
-does not rename nor change mode). Textual patches, renames or
462
-mode changes have preimage and postimage pathnames in different
463
-places in a form that can be parsed unambiguously and did not suffer
464
-from this problem.
465
-
466
-Will merge to 'master' as part of the fourth batch.
467
-
468
-* jc/maint-doc-checkout-b-always-takes-branch-name (2012-08-26) 1 commit
469
- (merged to 'next' on 2012-08-29 at e0d0f5c)
470
- + doc: "git checkout -b/-B/--orphan" always takes a branch name
471
-
472
-The synopsis said "checkout [-B branch]" to make it clear the branch
473
-name is a parameter to the option, but the heading for the option
474
-description was "-B::", not "-B branch::", making the documentation
475
-misleading. There may be room in documentation pages of other
476
-commands for similar improvements (hint, hint).
477
-
478
-Will merge to 'master' as part of the fourth batch.
479
-
480
-* jk/maint-http-half-auth-push (2012-08-27) 8 commits
481
- (merged to 'next' on 2012-08-29 at 0ed32f5)
482
- + http: prompt for credentials on failed POST
483
- + http: factor out http error code handling
484
- + t: test http access to "half-auth" repositories
485
- + t: test basic smart-http authentication
486
- + t/lib-httpd: recognize */smart/* repos as smart-http
487
- + t/lib-httpd: only route auth/dumb to dumb repos
488
- + t5550: factor out http auth setup
489
- + t5550: put auth-required repo in auth/dumb
490
-
491
-Pushing to smart HTTP server with recent Git fails without having
492
-the username in the URL to force authentication, if the server is
493
-configured to allow GET anonymously, while requiring authentication
494
-for POST.
495
-
496
-Will merge to 'master' as part of the fourth batch.
497
-
609
* mh/fetch-filter-refs (2012-08-26) 17 commits
610
- filter_refs(): simplify logic
611
- fetch_pack(): free matching heads
@@ -517,32 +628,23 @@ Will merge to 'master' as part of the fourth batch.
628
Code simplification and clarification.
629
Waiting for a follow-up patch based on Peff's idea.
630
520
-* nd/branch-v-alignment (2012-08-27) 1 commit
521
- (merged to 'next' on 2012-08-29 at 5c0d226)
522
- + branch -v: align even when branch names are in UTF-8
523
-
524
-Output from "git branch -v" contains "(no branch)" that could be
525
-localized, but the code to align it along with the names of branches
526
-were counting in bytes, not in display columns.
527
-
528
-Will merge to 'master' as part of the fourth batch.
529
-
631
* jc/merge-bases (2012-08-31) 9 commits
531
- - reduce_heads(): reimplement on top of remove_redundant()
532
- - merge-base: "--is-ancestor A B"
533
- - get_merge_bases_many(): walk from many tips in parallel
534
- - in_merge_bases(): use paint_down_to_common()
535
- - merge_bases_many(): split out the logic to paint history
536
- - in_merge_bases(): omit unnecessary redundant common ancestor reduction
537
- - http-push: use in_merge_bases() for fast-forward check
538
- - receive-pack: use in_merge_bases() for fast-forward check
539
- - in_merge_bases(): support only one "other" commit
632
+ (merged to 'next' on 2012-09-07 at ab0974d)
633
+ + reduce_heads(): reimplement on top of remove_redundant()
634
+ + merge-base: "--is-ancestor A B"
635
+ + get_merge_bases_many(): walk from many tips in parallel
636
+ + in_merge_bases(): use paint_down_to_common()
637
+ + merge_bases_many(): split out the logic to paint history
638
+ + in_merge_bases(): omit unnecessary redundant common ancestor reduction
639
+ + http-push: use in_merge_bases() for fast-forward check
640
+ + receive-pack: use in_merge_bases() for fast-forward check
641
+ + in_merge_bases(): support only one "other" commit
642
643
Optimise the "merge-base" computation a bit, and also update its
644
users that do not need the full merge-base information to call a
645
cheaper subset.
646
545
-Will merge to 'next'.
647
+Will merge to 'master' as part of the fifth batch.
648
649
* jl/submodule-rm (2012-08-27) 1 commit
650
- Teach rm to remove submodules unless they contain a git directory
@@ -555,35 +657,6 @@ no local changes in the submodule working tree, and its repository
657
is not embedded in its working tree but is elsewhere and uses the
658
gitfile mechanism to point at it.
659
558
-* nd/am-i18n-fix (2012-08-22) 1 commit
559
- (merged to 'next' on 2012-08-24 at f8e9a63)
560
- + am: quote string for translation before passing to eval_gettextln
561
-
562
-"git am" wasn't marked up for i18n properly.
563
-
564
-Will merge to 'master' as part of the fourth batch.
565
-
566
-* lt/commit-tree-guess-utf-8 (2012-08-21) 1 commit
567
- (merged to 'next' on 2012-08-24 at d16ac69)
568
- + commit/commit-tree: correct latin1 to utf-8
569
-
570
-Teaches "git commit" and "git commit-tree" the "we are told to use
571
-utf-8 in log message, but this does not look like utf-8---attempt to
572
-pass it through convert-from-latin1-to-utf8 and see if it makes
573
-sense" heuristics "git mailinfo" already uses.
574
-
575
-Will merge to 'master' as part of the fourth batch.
576
-
577
-* kk/maint-for-each-ref-multi-sort (2012-08-21) 2 commits
578
- (merged to 'next' on 2012-08-24 at 28a5db4)
579
- + for-each-ref: Fix sort with multiple keys
580
- + t6300: test sort with multiple keys
581
-
582
-"git for-each-ref" did not currectly support more than one --sort
583
-option.
584
-
585
-Will merge to 'master' as part of the fourth batch.
586
-
660
* fa/remote-svn (2012-08-28) 16 commits
661
- Add a test script for remote-svn
662
- remote-svn: add marks-file regeneration
@@ -616,129 +689,6 @@ Waiting for comments from mentors and stakeholders.
689
A GSoC project. Looked promising.
690
Waiting for comments from mentors and stakeholders.
691
619
-* nd/i18n-parseopt-help (2012-08-22) 66 commits
620
- (merged to 'next' on 2012-08-24 at 2a04ce0)
621
- + Use imperative form in help usage to describe an action
622
- + Reduce translations by using same terminologies
623
- + i18n: write-tree: mark parseopt strings for translation
624
- + i18n: verify-tag: mark parseopt strings for translation
625
- + i18n: verify-pack: mark parseopt strings for translation
626
- + i18n: update-server-info: mark parseopt strings for translation
627
- + i18n: update-ref: mark parseopt strings for translation
628
- + i18n: update-index: mark parseopt strings for translation
629
- + i18n: tag: mark parseopt strings for translation
630
- + i18n: symbolic-ref: mark parseopt strings for translation
631
- + i18n: show-ref: mark parseopt strings for translation
632
- + i18n: show-branch: mark parseopt strings for translation
633
- + i18n: shortlog: mark parseopt strings for translation
634
- + i18n: rm: mark parseopt strings for translation
635
- + i18n: revert, cherry-pick: mark parseopt strings for translation
636
- + i18n: rev-parse: mark parseopt strings for translation
637
- + i18n: reset: mark parseopt strings for translation
638
- + i18n: rerere: mark parseopt strings for translation
639
- + i18n: status: mark parseopt strings for translation
640
- + i18n: replace: mark parseopt strings for translation
641
- + i18n: remote: mark parseopt strings for translation
642
- + i18n: read-tree: mark parseopt strings for translation
643
- + i18n: push: mark parseopt strings for translation
644
- + i18n: prune: mark parseopt strings for translation
645
- + i18n: prune-packed: mark parseopt strings for translation
646
- + i18n: pack-refs: mark parseopt strings for translation
647
- + i18n: pack-objects: mark parseopt strings for translation
648
- + i18n: notes: mark parseopt strings for translation
649
- + i18n: name-rev: mark parseopt strings for translation
650
- + i18n: mv: mark parseopt strings for translation
651
- + i18n: mktree: mark parseopt strings for translation
652
- + i18n: merge: mark parseopt strings for translation
653
- + i18n: merge-file: mark parseopt strings for translation
654
- + i18n: merge-base: mark parseopt strings for translation
655
- + i18n: ls-tree: mark parseopt strings for translation
656
- + i18n: ls-files: mark parseopt strings for translation
657
- + i18n: log: mark parseopt strings for translation
658
- + i18n: init-db: mark parseopt strings for translation
659
- + i18n: help: mark parseopt strings for translation
660
- + i18n: hash-object: mark parseopt strings for translation
661
- + i18n: grep: mark parseopt strings for translation
662
- + i18n: gc: mark parseopt strings for translation
663
- + i18n: fsck: mark parseopt strings for translation
664
- + i18n: format-patch: mark parseopt strings for translation
665
- + i18n: for-each-ref: mark parseopt strings for translation
666
- + i18n: fmt-merge-msg: mark parseopt strings for translation
667
- + i18n: fetch: mark parseopt strings for translation
668
- + i18n: fast-export: mark parseopt strings for translation
669
- + i18n: describe: mark parseopt strings for translation
670
- + i18n: config: mark parseopt strings for translation
671
- + i18n: count-objects: mark parseopt strings for translation
672
- + i18n: commit: mark parseopt strings for translation
673
- + i18n: column: mark parseopt strings for translation
674
- + i18n: clone: mark parseopt strings for translation
675
- + i18n: clean: mark parseopt strings for translation
676
- + i18n: cherry: mark parseopt strings for translation
677
- + i18n: checkout: mark parseopt strings for translation
678
- + i18n: checkout-index: mark parseopt strings for translation
679
- + i18n: check-attr: mark parseopt strings for translation
680
- + i18n: cat-file: mark parseopt strings for translation
681
- + i18n: branch: mark parseopt strings for translation
682
- + i18n: blame: mark parseopt strings for translation
683
- + i18n: add: mark parseopt strings for translation
684
- + i18n: bisect--helper: mark parseopt strings for translation
685
- + i18n: archive: mark parseopt strings for translation
686
- + i18n: mark "style" in OPT_COLUMN() for translation
687
-
688
-A lot of i18n mark-up for the help text from "git <cmd> -h".
689
-
690
-Will merge to 'master' as part of the fourth batch.
691
-
692
-* tr/maint-parseopt-avoid-empty (2012-08-20) 1 commit
693
- (merged to 'next' on 2012-08-24 at cffa9a0)
694
- + gettext: do not translate empty string
695
-
696
-A workaround to avoid doing _(""), which translates to unwanted
697
-magic string in the .po files.
698
-
699
-Will merge to 'master' as part of the fourth batch.
700
-
701
-* jk/config-warn-on-inaccessible-paths (2012-08-21) 4 commits
702
- (merged to 'next' on 2012-08-24 at 7470bd6)
703
- + warn_on_inaccessible(): a helper to warn on inaccessible paths
704
- + attr: warn on inaccessible attribute files
705
- + gitignore: report access errors of exclude files
706
- + config: warn on inaccessible files
707
-
708
-When looking for $HOME/.gitconfig etc., it is OK if we cannot read
709
-them because they do not exist, but unable to read existing ones
710
-need to be diagnosed.
711
-
712
-Will merge to 'master' as part of the fourth batch.
713
-
714
-* nd/i18n-poison-test-updates (2012-08-27) 7 commits
715
- (merged to 'next' on 2012-08-29 at 9b7ff7f)
716
- + Fix tests under GETTEXT_POISON on parseopt
717
- + Fix tests under GETTEXT_POISON on git-remote
718
- + Fix tests under GETTEXT_POISON on pack-object
719
- + Fix tests under GETTEXT_POISON on git-apply
720
- + Fix tests under GETTEXT_POISON on diffstat
721
- + Fix tests under GETTEXT_POISON on git-stash
722
- + Fix tests under GETTEXT_POISON on relative dates
723
-
724
-Updates to tests that can be broken with gettext-poison builds.
725
-Queued with trivial fix-ups.
726
-
727
-Will merge to 'master' as part of the third batch.
728
-
729
-* pw/p4-use-client-spec-branch-detection (2012-08-20) 5 commits
730
- (merged to 'next' on 2012-08-24 at 08abc61)
731
- + git p4: make branch detection work with --use-client-spec
732
- + git p4: do wildcard decoding in stripRepoPath
733
- + git p4: set self.branchPrefixes in initialization
734
- + git p4 test: add broken --use-client-spec --detect-branches tests
735
- + git p4 test: move client_view() function to library
736
-
737
-Fixes "git p4" when "--use-client-spec" and "--detect-branches" are
738
-used together (the command used to misdetect branches).
739
-
740
-Will merge to 'master' as part of the fourth batch.
741
-
692
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
693
- pager: drop "wait for output to run less" hack
694