What's cooking (2011/03 #02)
Junio C Hamano committed
Mar 20, 2011 at 12:48 UTC
5473db98770e4b4a367c4965a60cb89c7469d4d0
1 file changed
+301
-209
whats-cooking.txt
+301
-209
@@ -1,24 +1,40 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2011, #01; Wed, 9)
3
-X-master-at: 83c3c6222a2331042c973a991572eafa37f25d1d
4
-X-next-at: 3762932566eb538e640deb32358f68ec4c28ad7f
2
+Subject: What's cooking in git.git (Mar 2011, #02; Sun, 20)
3
+X-master-at: a91df69cbb5ced7837525106ff57ff349180770b
4
+X-next-at: a171c98383be633c617ac36a0665e26416ac90bd
5
6
-What's cooking in git.git (Mar 2011, #01; Wed, 9)
6
+What's cooking in git.git (Mar 2011, #02; Sun, 20)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-I started draft release notes for 1.7.5 on 'master' branch.
12
+The very basic of i18n is now in 'master'. I'll be moving the rest of the
13
+series forward shortly.
14
15
--------------------------------------------------
15
-[New Topics]
16
+[Graduated to "master"]
17
17
-* en/merge-recursive (2011-02-28) 3 commits
18
- (merged to 'next' on 2011-03-09 at 3762932)
19
- + merge-recursive: When we detect we can skip an update, actually skip it
20
- + t6022: New test checking for unnecessary updates of files in D/F conflicts
21
- + t6022: New test checking for unnecessary updates of renamed+modified files
18
+* ab/i18n-basic (2011-02-25) 9 commits
19
+ (merged to 'next' on 2011-03-10 at ab70d57)
20
+ + i18n: "make distclean" should clean up after "make pot"
21
+ + i18n: Makefile: "pot" target to extract messages marked for translation
22
+ + i18n: add stub Q_() wrapper for ngettext
23
+ + i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
24
+ + i18n: add GETTEXT_POISON to simulate unfriendly translator
25
+ + i18n: add no-op _() and N_() wrappers
26
+ + commit, status: use status_printf{,_ln,_more} helpers
27
+ + commit: refer to commit template as s->fp
28
+ + wt-status: add helpers for printing wt-status lines
29
+ (this branch is used by ab/i18n-st.)
30
+
31
+* fk/maint-cvsimport-early-failure (2011-01-31) 1 commit
32
+ (merged to 'next' on 2011-03-09 at b4dee9e)
33
+ + git-cvsimport.perl: Bail out right away when reading from the server fails
34
+
35
+* jc/checkout-orphan-warning (2011-02-18) 1 commit
36
+ (merged to 'next' on 2011-03-09 at 765cf75)
37
+ + commit: give final warning when reattaching HEAD to leave commits behind
38
39
* jc/maint-apply-no-double-patch (2011-03-04) 1 commit
40
(merged to 'next' on 2011-03-09 at 6ec48e7)
@@ -28,75 +44,196 @@ I started draft release notes for 1.7.5 on 'master' branch.
44
(merged to 'next' on 2011-03-09 at 1bb74ef)
45
+ apply -v: show offset count when patch did not apply exactly
46
31
-* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
32
- - [wip] commit: allow editing notes in commit message editor
33
- - notes: make expand_notes_ref globally accessible
47
+* jh/maint-do-not-track-non-branches (2011-02-17) 1 commit
48
+ (merged to 'next' on 2011-03-09 at 13a9328)
49
+ + branch/checkout --track: Ensure that upstream branch is indeed a branch
50
35
-* js/rerere-forget-always-take-pathspec (2011-03-01) 1 commit
36
- - rerere forget: deprecate invocation without pathspec
51
+* jk/format-patch-multiline-header (2011-02-23) 3 commits
52
+ (merged to 'next' on 2011-03-09 at f970fe3)
53
+ + format-patch: rfc2047-encode newlines in headers
54
+ + format-patch: wrap long header lines
55
+ + strbuf: add fixed-length version of add_wrapped_text
56
38
-* mg/grep-full-tree (2011-03-01) 2 commits
39
- - grep: make --full-tree work with pathspecs
40
- - grep: --full-tree
57
+* jk/merge-rename-ux (2011-02-20) 6 commits
58
+ (merged to 'next' on 2011-03-09 at df1943a)
59
+ + pull: propagate --progress to merge
60
+ + merge: enable progress reporting for rename detection
61
+ + add inexact rename detection progress infrastructure
62
+ + commit: stop setting rename limit
63
+ + bump rename limit defaults (again)
64
+ + merge: improve inexact rename limit warning
65
+
66
+* jk/strbuf-vaddf (2011-03-08) 3 commits
67
+ (merged to 'next' on 2011-03-09 at 9651bc5)
68
+ + compat: fall back on __va_copy if available
69
+ + strbuf: add strbuf_vaddf
70
+ + compat: provide a fallback va_copy definition
71
+ (this branch is used by ab/i18n-basic, ab/i18n-st, jk/trace-sifter and jn/status-translatable.)
72
+
73
+* jk/trace-sifter (2011-02-24) 6 commits
74
+ (merged to 'next' on 2011-03-09 at 07841db)
75
+ + trace: give repo_setup trace its own key
76
+ + add packet tracing debug code
77
+ + trace: add trace_strbuf
78
+ + trace: factor out "do we want to trace" logic
79
+ + trace: refactor to support multiple env variables
80
+ + trace: add trace_vprintf
81
+
82
+* jn/maint-instaweb-plack-fix (2011-02-26) 1 commit
83
+ (merged to 'next' on 2011-03-09 at 3c9e14b)
84
+ + git-instaweb: Change how gitweb.psgi is made runnable as standalone app
85
+
86
+* jn/status-translatable (2011-02-25) 3 commits
87
+ (merged to 'next' on 2011-03-09 at d00d23d)
88
+ + commit, status: use status_printf{,_ln,_more} helpers
89
+ + commit: refer to commit template as s->fp
90
+ + wt-status: add helpers for printing wt-status lines
91
+
92
+* js/rerere-forget-always-take-pathspec (2011-03-01) 1 commit
93
+ (merged to 'next' on 2011-03-10 at 2d1ded3)
94
+ + rerere forget: deprecate invocation without pathspec
95
96
* mg/rev-list-n-reverse-doc (2011-03-08) 2 commits
43
- - git-log.txt,rev-list-options.txt: put option blocks in proper order
44
- - git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
97
+ (merged to 'next' on 2011-03-10 at 62d3161)
98
+ + git-log.txt,rev-list-options.txt: put option blocks in proper order
99
+ + git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting
100
101
* mm/maint-log-n-with-diff-filtering (2011-03-09) 1 commit
47
- - log: fix --max-count when used together with -S or -G
102
+ (merged to 'next' on 2011-03-10 at 33af1cd)
103
+ + log: fix --max-count when used together with -S or -G
104
+
105
+* mm/push-default-advice (2011-03-02) 2 commits
106
+ (merged to 'next' on 2011-03-09 at 160095b)
107
+ + push: better error message when no remote configured
108
+ + push: better error messages when push.default = tracking
109
110
* mr/hpux (2011-03-07) 2 commits
111
(merged to 'next' on 2011-03-09 at 8a5fe11)
112
+ git-compat-util.h: Honor HP C's noreturn attribute
113
+ Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section
114
54
-* nd/init-gitdir (2011-03-03) 1 commit
55
- - init, clone: support --real-git-dir for .git file
115
+* sp/maint-fd-limit (2011-03-02) 3 commits
116
+ (merged to 'next' on 2011-03-09 at 389e97d)
117
+ + sha1_file.c: Don't retain open fds on small packs
118
+ + mingw: add minimum getrlimit() compatibility stub
119
+ + Limit file descriptors used by packs
120
+
121
+* ss/mergetool--lib (2011-02-27) 2 commits
122
+ (merged to 'next' on 2011-03-09 at 004fb9c)
123
+ + mergetool--lib: Add Beyond Compare 3 as a tool
124
+ + mergetool--lib: Sort tools alphabetically for easier lookup
125
+
126
+* uk/ls-remote-in-get-remote-url (2011-03-01) 2 commits
127
+ (merged to 'next' on 2011-03-09 at 09b570b)
128
+ + git-request-pull: open-code the only invocation of get_remote_url
129
+ + get_remote_url(): use the same data source as ls-remote to get remote urls
130
131
--------------------------------------------------
58
-[Graduated to "master"]
132
+[New Topics]
133
60
-* jc/grep--no-index-pathspec-fix (2011-02-16) 1 commit
61
- + grep --no-index: honor pathspecs correctly
134
+* jc/maint-fetch-alt (2011-03-11) 2 commits
135
+ (merged to 'next' on 2011-03-17 at c61ec4f)
136
+ + fetch-pack: objects in our alternates are available to us
137
+ + refs_from_alternate: helper to use refs from alternates
138
63
-* jk/diffstat-binary (2011-02-19) 2 commits
64
- + diff: don't retrieve binary blobs for diffstat
65
- + diff: handle diffstat of rewritten binary files
139
+* jc/maint-rerere-in-workdir (2011-03-10) 1 commit
140
+ - rerere: make sure it works even in a workdir attached to a young repository
141
67
-* jk/fail-null-clone (2011-02-17) 1 commit
68
- + clone: die when trying to clone missing local path
142
+Do not merge; needs more thought around relative symlinks.
143
70
-* jn/maint-commit-missing-template (2011-02-25) 1 commit
71
- + commit: error out for missing commit message template
144
+* lt/default-abbrev (2010-10-28) 1 commit
145
+ (merged to 'next' on 2011-03-17 at 1d7e406)
146
+ + Make the default abbrev length configurable
147
73
-* jn/test-terminal-punt-on-osx-breakage (2011-02-17) 1 commit
74
- + tests: skip terminal output tests on OS X
148
+The configuration roughly corresponds to --abbrev command line option, so
149
+I should rename it back to core.abbrev as Linus originally named it.
150
76
-* js/checkout-untracked-symlink (2011-02-20) 2 commits
77
- + do not overwrite untracked symlinks
78
- + Demonstrate breakage: checkout overwrites untracked symlink with directory
151
+* pk/stash-apply-status-relative (2011-03-12) 1 commit
152
+ - git stash: show status relative to current directory
153
80
-* js/cherry-pick-usability (2011-02-19) 4 commits
81
- + Teach commit about CHERRY_PICK_HEAD
82
- + bash: teach __git_ps1 about CHERRY_PICK_HEAD
83
- + Introduce CHERRY_PICK_HEAD
84
- + t3507: introduce pristine-detach helper
154
+Will merge to 'next'.
155
86
-* lt/rename-no-extra-copy-detection (2011-02-18) 3 commits
87
- + diffcore-rename: improve estimate_similarity() heuristics
88
- + diffcore-rename: properly honor the difference between -M and -C
89
- + for_each_hash: allow passing a 'void *data' pointer to callback
156
+* sg/complete-symmetric-diff (2011-03-10) 2 commits
157
+ (merged to 'next' on 2011-03-17 at adb0618)
158
+ + bash: complete 'git diff ...branc<TAB>'
159
+ + bash: fix misindented esac statement in __git_complete_file()
160
91
-* mg/maint-difftool-vim-readonly (2011-02-25) 1 commit
92
- + mergetool-lib: call vim in readonly mode for diffs
161
+* jc/maint-rev-list-culled-boundary (2011-03-14) 1 commit
162
+ (merged to 'next' on 2011-03-17 at 001b546)
163
+ + list-objects.c: don't add an unparsed NULL as a pending tree
164
94
-* mh/p4 (2011-02-25) 1 commit
95
- + git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
165
+* jn/test-sanitize-git-env (2011-03-15) 5 commits
166
+ (merged to 'next' on 2011-03-17 at 80a3678)
167
+ + tests: scrub environment of GIT_* variables
168
+ + config: drop support for GIT_CONFIG_NOGLOBAL
169
+ + gitattributes: drop support for GIT_ATTR_NOGLOBAL
170
+ + tests: suppress system gitattributes
171
+ + tests: stop worrying about obsolete environment variables
172
97
-* so/submodule-no-update-first-time (2011-02-17) 2 commits
98
- + t7406: "git submodule update {--merge|--rebase]" with new submodules
99
- + submodule: no [--merge|--rebase] when newly cloned
173
+* js/maint-stash-index-copy (2011-03-16) 2 commits
174
+ (merged to 'next' on 2011-03-17 at 9f74cc8)
175
+ + stash: copy the index using --index-output instead of cp -p
176
+ + stash: fix incorrect quoting in cleanup of temporary files
177
+
178
+* sp/maint-fetch-pack-stop-early (2011-03-14) 2 commits
179
+ (merged to 'next' on 2011-03-17 at 2580068)
180
+ + fetch-pack: Implement no-done capability
181
+ + fetch-pack: Finish negotation if remote replies "ACK %s ready"
182
+ (this branch is used by jc/fetch-progressive-stride.)
183
+
184
+* sp/maint-upload-pack-stop-early (2011-03-14) 2 commits
185
+ (merged to 'next' on 2011-03-17 at e717a84)
186
+ + upload-pack: Implement no-done capability
187
+ + upload-pack: More aggressively send 'ACK %s ready'
188
+
189
+* mg/doc-bisect-tweak-worktree (2011-03-15) 2 commits
190
+ (merged to 'next' on 2011-03-17 at e0acf52)
191
+ + git-bisect.txt: example for bisecting with hot-fix
192
+ + git-bisect.txt: streamline run presentation
193
+
194
+* tl/p4 (2011-03-15) 3 commits
195
+ (merged to 'next' on 2011-03-17 at 3d7f69f)
196
+ + git-p4: Fix error message crash in P4Sync.commit.
197
+ + Teach git-p4 to ignore case in perforce filenames if configured.
198
+ + git-p4: Teach gitConfig method about arguments.
199
+
200
+* cn/system-path-tweak (2011-03-17) 1 commit
201
+ - system_path: use a static buffer
202
+
203
+* jc/fetch-progressive-stride (2011-03-18) 3 commits
204
+ - fetch-pack: use smaller handshake window for initial request
205
+ - fetch-pack: progressively use larger handshake windows
206
+ - fetch-pack: factor out hardcoded handshake window size
207
+ (this branch uses sp/maint-fetch-pack-stop-early.)
208
+
209
+The top two need to be cleaned up with correct author name.
210
+
211
+* jc/maint-diff-q-filter (2011-03-16) 1 commit
212
+ - diff --quiet: disable optimization when --diff-filter=X is used
213
+
214
+Will merge to 'next'.
215
+
216
+* jn/fortify-source-workaround (2011-03-16) 1 commit
217
+ - run-command: prettify -D_FORTIFY_SOURCE workaround
218
+
219
+Will merge to 'next'.
220
+
221
+* jn/maint-c99-format (2011-03-16) 2 commits
222
+ - unbreak and eliminate NO_C99_FORMAT
223
+ - mktag: avoid %td in format string
224
+
225
+Will merge to 'next'.
226
+
227
+* kc/gitweb-pathinfo-w-anchor (2011-03-18) 1 commit
228
+ - gitweb: fix #patchNN anchors when path_info is enabled
229
+
230
+Will merge to 'next'.
231
+
232
+* pw/p4 (2011-03-16) 2 commits
233
+ - git-p4: test sync new branch
234
+ - git-p4: fix sync new branch regression
235
+
236
+Will merge to 'next'.
237
238
--------------------------------------------------
239
[Stalled]
@@ -108,12 +245,55 @@ I started draft release notes for 1.7.5 on 'master' branch.
245
- merge: update the usage information to be more modern
246
247
There was an objection to the tip one that determines the upstream in a
111
-wrong way?
248
+wrong way? I've been wanting to move this forward for quite some time but
249
+also hoping somebody else would send in a final version.
250
+
251
+* mz/rebase (2011-02-28) 34 commits
252
+ - rebase: define options in OPTIONS_SPEC
253
+ (merged to 'next' on 2011-02-25 at 52caa7a)
254
+ + Makefile: do not install sourced rebase scripts
255
+ (merged to 'next' on 2011-02-22 at 3219155)
256
+ + rebase: use @{upstream} if no upstream specified
257
+ + rebase -i: remove unnecessary state rebase-root
258
+ + rebase -i: don't read unused variable preserve_merges
259
+ + git-rebase--am: remove unnecessary --3way option
260
+ + rebase -m: don't print exit code 2 when merge fails
261
+ + rebase -m: remember allow_rerere_autoupdate option
262
+ + rebase: remember strategy and strategy options
263
+ + rebase: remember verbose option
264
+ + rebase: extract code for writing basic state
265
+ + rebase: factor out sub command handling
266
+ + rebase: make -v a tiny bit more verbose
267
+ + rebase -i: align variable names
268
+ + rebase: show consistent conflict resolution hint
269
+ + rebase: extract am code to new source file
270
+ + rebase: extract merge code to new source file
271
+ + rebase: remove $branch as synonym for $orig_head
272
+ + rebase -i: support --stat
273
+ + rebase: factor out call to pre-rebase hook
274
+ + rebase: factor out clean work tree check
275
+ + rebase: factor out reference parsing
276
+ + rebase: reorder validation steps
277
+ + rebase -i: remove now unnecessary directory checks
278
+ + rebase: factor out command line option processing
279
+ + rebase: align variable content
280
+ + rebase: align variable names
281
+ + rebase: stricter check of standalone sub command
282
+ + rebase: act on command line outside parsing loop
283
+ + rebase: improve detection of rebase in progress
284
+ + rebase: remove unused rebase state 'prev_head'
285
+ + rebase: read state outside loop
286
+ + rebase: refactor reading of state
287
+ + rebase: clearer names for directory variables
288
+
289
+I think the tip one is a response to J6t's regression concerns; it looked
290
+Ok to me.
291
292
* jc/diff-irreversible-delete (2011-02-28) 1 commit
293
- git diff -D: omit the preimage of deletes
294
116
-Just a POC.
295
+"diff -B -D" should omit the deleting half of a broken pair from the
296
+output. Need documentation and tests.
297
298
* jc/index-pack (2011-02-25) 5 commits
299
- index-pack --verify: read anomalous offsets from v2 idx file
@@ -122,13 +302,8 @@ Just a POC.
302
- write_idx_file: introduce a struct to hold idx customization options
303
- index-pack: group the delta-base array entries also by type
304
125
-Still a WIP.
126
-
127
-* jc/complete-symmetric-diff (2011-02-23) 1 commit
128
- - completion: complete "git diff ...branc<TAB>"
129
-
130
-It was pointed out that this would regress diffing two blobs,
131
-using <tree>:<path> syntax.
305
+Still a WIP. Need to put histogram output into index-pack --verify to
306
+really kill verify-pack.
307
308
* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
309
- Look for password in both CVS and CVSNT password files.
@@ -147,16 +322,57 @@ flags needs to be rethought, or at least the helper needs to be moved to
322
builtin/tag.c to make it clear that it should not be used outside the
323
current usage context.
324
325
+* jk/edit-notes-in-commit-log (2011-03-07) 2 commits
326
+ - [wip] commit: allow editing notes in commit message editor
327
+ - notes: make expand_notes_ref globally accessible
328
+
329
* jc/rename-degrade-cc-to-c (2011-01-06) 3 commits
330
. diffcore-rename: fall back to -C when -C -C busts the rename limit
331
. diffcore-rename: record filepair for rename src
332
. diffcore-rename: refactor "too many candidates" logic
333
155
-Somebody said that this is an expensive no-op?
334
+Will take another look.
335
+
336
+* mg/grep-full-tree (2011-03-01) 2 commits
337
+ - grep: make --full-tree work with pathspecs
338
+ - grep: --full-tree
339
+
340
+Do not merge; it would be preferable to use ":/" or whatever magic
341
+pathspec that is relative to the root of the working tree.
342
+
343
+* nd/rfc-add-u-full-tree (2011-02-07) 1 commit
344
+ - add: make "add -u" update full tree without pathspec
345
+
346
+A three-phase migration that:
347
+
348
+ (1) first only warns when we would deviate from traditional behaviour and
349
+ suggest adding "." if the user wants to limit it to cwd, but doesn't
350
+ actually add full-tree, in the next release;
351
+
352
+ (2) warn that we have changed the behaviour and suggest adding "." if the
353
+ user wants to limit it to cwd, and actually do full-tree, in 1.8.0;
354
+
355
+ (3) remove the warning, in 1.8.X (for X at least 2 or more).
356
+
357
+would be a good way forward.
358
359
--------------------------------------------------
360
[Cooking]
361
362
+* en/merge-recursive (2011-03-17) 4 commits
363
+ (merged to 'next' on 2011-03-18 at a32016b)
364
+ + merge-recursive: tweak magic band-aid
365
+ (merged to 'next' on 2011-03-09 at 3762932)
366
+ + merge-recursive: When we detect we can skip an update, actually skip it
367
+ + t6022: New test checking for unnecessary updates of files in D/F conflicts
368
+ + t6022: New test checking for unnecessary updates of renamed+modified files
369
+
370
+I am not happy with these magic band aids.
371
+
372
+* nd/init-gitdir (2011-03-19) 2 commits
373
+ - init, clone: support --separate-git-dir for .git file
374
+ - git-init.txt: move description section up
375
+
376
* jl/submodule-fetch-on-demand (2011-03-06) 7 commits
377
- fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
378
- submodule update: Don't fetch when the submodule commit is already present
@@ -166,72 +382,20 @@ Somebody said that this is an expensive no-op?
382
- fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
383
- fetch/pull: recurse into submodules when necessary
384
169
-* mm/push-default-advice (2011-03-02) 2 commits
170
- (merged to 'next' on 2011-03-09 at 160095b)
171
- + push: better error message when no remote configured
172
- + push: better error messages when push.default = tracking
173
-
174
-* sp/maint-fd-limit (2011-03-02) 3 commits
175
- (merged to 'next' on 2011-03-09 at 389e97d)
176
- + sha1_file.c: Don't retain open fds on small packs
177
- + mingw: add minimum getrlimit() compatibility stub
178
- + Limit file descriptors used by packs
179
-
180
-* uk/ls-remote-in-get-remote-url (2011-03-01) 2 commits
181
- (merged to 'next' on 2011-03-09 at 09b570b)
182
- + git-request-pull: open-code the only invocation of get_remote_url
183
- + get_remote_url(): use the same data source as ls-remote to get remote urls
184
-
185
-* fk/maint-cvsimport-early-failure (2011-01-31) 1 commit
186
- (merged to 'next' on 2011-03-09 at b4dee9e)
187
- + git-cvsimport.perl: Bail out right away when reading from the server fails
188
-
189
-* jk/strbuf-vaddf (2011-03-08) 3 commits
190
- (merged to 'next' on 2011-03-09 at 9651bc5)
191
- + compat: fall back on __va_copy if available
192
- + strbuf: add strbuf_vaddf
193
- + compat: provide a fallback va_copy definition
194
- (this branch is used by ab/i18n-st, jk/trace-sifter and jn/status-translatable.)
195
-
196
-* jk/trace-sifter (2011-02-24) 6 commits
197
- (merged to 'next' on 2011-03-09 at 07841db)
198
- + trace: give repo_setup trace its own key
199
- + add packet tracing debug code
200
- + trace: add trace_strbuf
201
- + trace: factor out "do we want to trace" logic
202
- + trace: refactor to support multiple env variables
203
- + trace: add trace_vprintf
204
- (this branch uses jk/strbuf-vaddf; is tangled with ab/i18n-st and jn/status-translatable.)
205
-
206
-* jn/maint-instaweb-plack-fix (2011-02-26) 1 commit
207
- (merged to 'next' on 2011-03-09 at 3c9e14b)
208
- + git-instaweb: Change how gitweb.psgi is made runnable as standalone app
209
-
210
-* jn/status-translatable (2011-02-25) 3 commits
211
- (merged to 'next' on 2011-03-09 at d00d23d)
212
- + commit, status: use status_printf{,_ln,_more} helpers
213
- + commit: refer to commit template as s->fp
214
- + wt-status: add helpers for printing wt-status lines
215
- (this branch uses jk/strbuf-vaddf; is tangled with ab/i18n-st and jk/trace-sifter.)
216
-
217
-* nd/rfc-add-u-full-tree (2011-02-07) 1 commit
218
- - add: make "add -u" update full tree without pathspec
385
+Is this ready to move forward?
386
387
* ss/git-gui-mergetool (2011-02-26) 2 commits
221
- - mergetool--lib: Add Beyond Compare 3 as a tool
222
- - mergetool--lib: Sort tools alphabetically for easier lookup
223
-
224
-* ss/mergetool--lib (2011-02-27) 2 commits
225
- (merged to 'next' on 2011-03-09 at 004fb9c)
388
+ (merged to 'next' on 2011-03-17 at a8fac18)
389
+ mergetool--lib: Add Beyond Compare 3 as a tool
390
+ mergetool--lib: Sort tools alphabetically for easier lookup
391
392
+The CLI side (ss/mergetool--lib topic) will be in the next release, so
393
+I'll ping Pat to take this into gut-gui tree.
394
+
395
* nd/index-doc (2010-09-06) 1 commit
396
- doc: technical details about the index file format
397
232
-I'll try to find time to fill in the details.
233
-
234
-* ab/i18n-st (2011-02-22) 79 commits
398
+* ab/i18n-st (2011-02-22) 69 commits
399
- i18n: git-shortlog basic messages
400
- i18n: git-revert split up "could not revert/apply" message
401
- i18n: git-revert literal "me" messages
@@ -301,91 +465,19 @@ I'll try to find time to fill in the details.
465
- i18n: git-clone basic messages
466
- i18n: git-init "Initialized [...] repository" message
467
- i18n: git-init basic messages
304
- - i18n: "make distclean" should clean up after "make pot"
305
- - i18n: Makefile: "pot" target to extract messages marked for translation
306
- - i18n: avoid conflict with ngettext from libintl
307
- - i18n: add stub ngettext implementation
308
- - i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
309
- - i18n: add GETTEXT_POISON to simulate unfriendly translator
310
- - i18n: add no-op _() and N_() wrappers
311
- - commit, status: use status_printf{,_ln,_more} helpers
312
- - commit: refer to commit template as s->fp
313
- - wt-status: add helpers for printing wt-status lines
314
- (this branch uses jk/strbuf-vaddf; is tangled with jk/trace-sifter and jn/status-translatable.)
315
-
316
-Added ngettext() stuff to the base.
317
-Will merge early parts to 'next'.
318
-
319
-* jc/checkout-orphan-warning (2011-02-18) 1 commit
320
- (merged to 'next' on 2011-03-09 at 765cf75)
321
- + commit: give final warning when reattaching HEAD to leave commits behind
322
-
323
-* jh/maint-do-not-track-non-branches (2011-02-17) 1 commit
324
- (merged to 'next' on 2011-03-09 at 13a9328)
325
- + branch/checkout --track: Ensure that upstream branch is indeed a branch
468
327
-* jk/merge-rename-ux (2011-02-20) 6 commits
328
- (merged to 'next' on 2011-03-09 at df1943a)
329
- + pull: propagate --progress to merge
330
- + merge: enable progress reporting for rename detection
331
- + add inexact rename detection progress infrastructure
332
- + commit: stop setting rename limit
333
- + bump rename limit defaults (again)
334
- + merge: improve inexact rename limit warning
335
-
336
-* mg/rev-list-one-side-only (2011-03-07) 9 commits
337
- - t6007: test rev-list --cherry
338
- - log --cherry: a synonym
339
- - rev-list: documentation and test for --cherry-mark
340
- - revision.c: introduce --cherry-mark
341
- - rev-list/log: factor out revision mark generation
342
- - rev-list: --left/right-only are mutually exclusive
343
- - rev-list: documentation and test for --left/right-only
344
- - t6007: Make sure we test --cherry-pick
345
- - revlist.c: introduce --left/right-only for unsymmetric picking
469
+* mg/rev-list-one-side-only (2011-03-10) 10 commits
470
+ (merged to 'next' on 2011-03-10 at 2a69869)
471
+ + git-log: put space after commit mark
472
+ + t6007: test rev-list --cherry
473
+ + log --cherry: a synonym
474
+ + rev-list: documentation and test for --cherry-mark
475
+ + revision.c: introduce --cherry-mark
476
+ + rev-list/log: factor out revision mark generation
477
+ + rev-list: --left/right-only are mutually exclusive
478
+ + rev-list: documentation and test for --left/right-only
479
+ + t6007: Make sure we test --cherry-pick
480
+ + revlist.c: introduce --left/right-only for unsymmetric picking
481
+
482
+Looked sensible, including the change of the output.
483
347
-Will merge to 'next'. Looked much nicer than the previous round.
348
-
349
-* jk/format-patch-multiline-header (2011-02-23) 3 commits
350
- (merged to 'next' on 2011-03-09 at f970fe3)
351
- + format-patch: rfc2047-encode newlines in headers
352
- + format-patch: wrap long header lines
353
- + strbuf: add fixed-length version of add_wrapped_text
354
-
355
-* mz/rebase (2011-02-28) 34 commits
356
- - rebase: define options in OPTIONS_SPEC
357
- (merged to 'next' on 2011-02-25 at 52caa7a)
358
- + Makefile: do not install sourced rebase scripts
359
- (merged to 'next' on 2011-02-22 at 3219155)
360
- + rebase: use @{upstream} if no upstream specified
361
- + rebase -i: remove unnecessary state rebase-root
362
- + rebase -i: don't read unused variable preserve_merges
363
- + git-rebase--am: remove unnecessary --3way option
364
- + rebase -m: don't print exit code 2 when merge fails
365
- + rebase -m: remember allow_rerere_autoupdate option
366
- + rebase: remember strategy and strategy options
367
- + rebase: remember verbose option
368
- + rebase: extract code for writing basic state
369
- + rebase: factor out sub command handling
370
- + rebase: make -v a tiny bit more verbose
371
- + rebase -i: align variable names
372
- + rebase: show consistent conflict resolution hint
373
- + rebase: extract am code to new source file
374
- + rebase: extract merge code to new source file
375
- + rebase: remove $branch as synonym for $orig_head
376
- + rebase -i: support --stat
377
- + rebase: factor out call to pre-rebase hook
378
- + rebase: factor out clean work tree check
379
- + rebase: factor out reference parsing
380
- + rebase: reorder validation steps
381
- + rebase -i: remove now unnecessary directory checks
382
- + rebase: factor out command line option processing
383
- + rebase: align variable content
384
- + rebase: align variable names
385
- + rebase: stricter check of standalone sub command
386
- + rebase: act on command line outside parsing loop
387
- + rebase: improve detection of rebase in progress
388
- + rebase: remove unused rebase state 'prev_head'
389
- + rebase: read state outside loop
390
- + rebase: refactor reading of state
391
- + rebase: clearer names for directory variables