What's cooking (2010/08 #06)
Junio C Hamano committed
Aug 26, 2010 at 16:54 UTC
071b762bb2f526ff8afd0ef4db24e8303e6308a2
1 file changed
+209
-204
whats-cooking.txt
+209
-204
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2010, #05; Sat, 21)
3
-X-master-at: 5cba1229d8246da2a6d1d956eeed8227f69e185b
4
-X-next-at: 5af700393e003167b0b86690fd4132ebfc677088
2
+Subject: What's cooking in git.git (Aug 2010, #06; Thu, 26)
3
+X-master-at: 515cc0101943b766fde7aa894827119e332ec033
4
+X-next-at: 7180a87c9a993afee64514d82f1e85dbacc8e120
5
6
-What's cooking in git.git (Aug 2010, #05; Sat, 21)
6
+What's cooking in git.git (Aug 2010, #06; Thu, 26)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,104 +12,121 @@ marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
--------------------------------------------------
15
-[Graduated to "master"]
16
-
17
-* ab/perl-install (2010-08-03) 1 commit
18
- (merged to 'next' on 2010-08-14 at f2a27ee)
19
- + perl/Makefile: Unset INSTALL_BASE when making perl.mak
20
-
21
-* dg/local-mod-error-messages (2010-08-11) 5 commits
22
- (merged to 'next' on 2010-08-14 at e684ca8)
23
- + t7609: test merge and checkout error messages
24
- + unpack_trees: group error messages by type
25
- + merge-recursive: distinguish "removed" and "overwritten" messages
26
- + merge-recursive: porcelain messages for checkout
27
- + Turn unpack_trees_options.msgs into an array + enum
28
-
29
-* en/rebase-against-rebase-fix (2010-08-12) 2 commits
30
- (merged to 'next' on 2010-08-14 at 1dea7b9)
31
- + pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
32
- + t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
33
-
34
-* gb/split-cmdline-errmsg (2010-08-07) 1 commit
35
- (merged to 'next' on 2010-08-14 at 41146ff)
36
- + split_cmdline: Allow caller to access error string
37
-
38
-* hv/submodule-find-ff-merge (2010-07-07) 3 commits
39
- (merged to 'next' on 2010-08-11 at 6900d2c)
40
- + Implement automatic fast-forward merge for submodules
41
- + setup_revisions(): Allow walking history in a submodule
42
- + Teach ref iteration module about submodules
43
-
44
-* mm/rebase-i-exec (2010-08-13) 4 commits
45
- (merged to 'next' on 2010-08-14 at 17620dc)
46
- + git-rebase--interactive.sh: use printf instead of echo to print commit message
47
- + git-rebase--interactive.sh: rework skip_unnecessary_picks
48
- (merged to 'next' on 2010-08-12 at 377e3f0)
49
- + test-lib: user-friendly alternatives to test [-d|-f|-e]
50
- + rebase -i: add exec command to launch a shell command
51
-
52
-* mm/shortopt-detached (2010-08-05) 5 commits
53
- (merged to 'next' on 2010-08-12 at 35ceb98)
54
- + log: parse separate option for --glob
55
- + log: parse separate options like git log --grep foo
56
- + diff: parse separate options --stat-width n, --stat-name-width n
57
- + diff: split off a function for --stat-* option parsing
58
- + diff: parse separate options like -S foo
59
-
60
-* nd/fix-sparse-checkout (2010-07-31) 5 commits
61
- (merged to 'next' on 2010-08-12 at 4f7a3b9)
62
- + unpack-trees: mark new entries skip-worktree appropriately
63
- + unpack-trees: do not check for conflict entries too early
64
- + unpack-trees: let read-tree -u remove index entries outside sparse area
65
- + unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
66
- + t1011 (sparse checkout): style nitpicks
67
-
68
-* po/userdiff-csharp (2010-08-16) 1 commit
69
- (merged to 'next' on 2010-08-18 at f5edb3a)
70
- + Userdiff patterns for C#
71
-
72
-* so/http-user-agent (2010-08-11) 1 commit
73
- (merged to 'next' on 2010-08-12 at 86cc5c4)
74
- + Allow HTTP user agent string to be modified.
75
-
76
-* sr/local-config (2010-08-03) 1 commit
77
- (merged to 'next' on 2010-08-12 at 431f7af)
78
- + config: add --local option
15
+[New Topics]
16
+
17
+* mg/doc-bundle (2010-08-23) 3 commits
18
+ (merged to 'next' on 2010-08-23 at 2251a51)
19
+ + git-bundle.txt: Clarify rev-list-args restrictions
20
+ + git-bundle.txt: whitespace cleanup
21
+ + git-bundle.txt: Cleanup
22
+
23
+* jc/builtin-binsearch (2010-08-05) 2 commits
24
+ . git.c: binary search in the built-in command list
25
+ . git.c: sort the list of built-in command names
26
+
27
+* bc/maint-fetch-url-only (2010-08-25) 2 commits
28
+ - builtin/fetch.c: ignore merge config when not fetching from branch's remote
29
+ - t/t5510: demonstrate failure to fetch when current branch has merge ref
30
+
31
+* jc/maint-doc-em-dash (2010-08-23) 1 commit
32
+ (merged to 'next' on 2010-08-24 at 2e4d30b)
33
+ + Work around em-dash handling in newer AsciiDoc
34
+
35
+* jf/merge-ignore-ws (2010-08-26) 4 commits
36
+ - merge-recursive: options to ignore whitespace changes
37
+ - merge-recursive --patience
38
+ - ll-merge: replace flag argument with options struct
39
+ - merge-recursive: expose merge options for builtin merge
40
+ (this branch uses eb/double-convert-before-merge, jn/merge-renormalize and jn/merge-renormalize.)
41
+
42
+* jk/maint-pass-c-config-in-env (2010-08-24) 2 commits
43
+ - do not pass "git -c foo=bar" params to transport helpers
44
+ - pass "git -c foo=bar" params through environment
45
+
46
+* jl/submodule-ignore-diff (2010-08-25) 1 commit
47
+ (merged to 'next' on 2010-08-26 at af1c819)
48
+ + checkout: respect diff.ignoreSubmodules setting
49
+
50
+* js/maint-reflog-beyond-horizon (2010-08-24) 3 commits
51
+ (merged to 'next' on 2010-08-26 at 4281562)
52
+ + rev-parse: tests git rev-parse --verify master@{n}, for various n
53
+ + sha1_name.c: use warning in preference to fprintf(stderr
54
+ + rev-parse: exit with non-zero status if ref@{n} is not valid.
55
+
56
+* rr/fmt-merge-msg (2010-08-25) 3 commits
57
+ - merge: Make 'merge.log' an integer or boolean option
58
+ - merge: Make '--log' an integer option for number of shortlog entries
59
+ - fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
60
+ (this branch uses jn/update-contrib-example-merge.)
61
+
62
+* tr/merge-unborn-clobber (2010-08-22) 1 commit
63
+ - Exhibit merge bug that clobbers index&WT
64
+
65
+* en/object-list-with-pathspec (2010-08-26) 2 commits
66
+ - Make rev-list --objects work together with pathspecs
67
+ - Add testcases showing how pathspecs are ignored with rev-list --objects
68
+
69
+* en/tree-walk-optim (2010-08-26) 4 commits
70
+ - diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
71
+ - tree_entry_interesting(): Make return value more specific
72
+ - tree-walk: Correct bitrotted comment about tree_entry()
73
+ - Document pre-condition for tree_entry_interesting
74
75
--------------------------------------------------
81
-[New Topics]
76
+[Stalled]
77
+
78
+* jc/log-grep (2010-08-23) 1 commit
79
+ - git log: add -G<regexp> that greps in the patch text
80
+
81
+This is broken, but haven't found any time to revisit it yet.
82
+
83
+* zl/mailinfo-recode-patch (2010-06-14) 2 commits
84
+ - add --recode-patch option to git-am
85
+ - add --recode-patch option to git-mailinfo
86
+
87
+I recall there was another round of re-roll planned for this one.
88
+
89
+* jk/tag-contains (2010-07-05) 4 commits
90
+ - Why is "git tag --contains" so slow?
91
+ - default core.clockskew variable to one day
92
+ - limit "contains" traversals based on commit timestamp
93
+ - tag: speed up --contains calculation
94
+
95
+--------------------------------------------------
96
+[Cooking]
97
98
* jn/maint-doc-user-manual-html-doctype (2010-08-21) 2 commits
84
- - docs: fix Makefile dependency for user manual
85
- - Documentation: set a !DOCTYPE for user manual
99
+ (merged to 'next' on 2010-08-26 at e9084af)
100
+ + docs: fix Makefile dependency for user manual
101
+ + Documentation: set a !DOCTYPE for user manual
102
103
* cb/maint-mergetool-no-tty (2010-08-20) 1 commit
88
- - mergetool: Remove explicit references to /dev/tty
104
+ (merged to 'next' on 2010-08-26 at b14989a)
105
+ + mergetool: Remove explicit references to /dev/tty
106
107
* jn/doc-backslash (2010-08-20) 17 commits
91
- - Documentation: remove stray backslash in show-branch discussion
92
- - Documentation: remove stray backslashes from "Fighting regressions" article
93
- - Documentation: do not convert ... operator to ellipses
94
- - Documentation: avoid stray backslash in user manual
95
- - Documentation: avoid stray backslashes in core tutorial
96
- - Documentation: remove stray backslashes in rev-parse manual
97
- - Documentation: remove backslash before ~ in fast-import manual
98
- - Documentation: remove stray backslash from "git bundle" manual
99
- - Documentation/technical: avoid stray backslash in parse-options API docs
100
- - Documentation: remove backslashes in manpage synopses
101
- - Documentation: clarify quoting in gitignore docs
102
- - Documentation: clarify quoting in "git rm" example
103
- - Documentation: add missing quotes to "git grep" examples
104
- - Documentation: clarify quoting in "git add" example
105
- - Documentation: unbreak regex in show-ref manual
106
- - Documentation: quoting trouble in "git rm" discussion
107
- - Documentation: tweak description of log.date
108
-
109
-* nd/clone-depth-zero (2010-08-20) 3 commits
110
- - {fetch,upload}-pack: allow --depth=0 for infinite depth
111
- - fetch-pack: use args.shallow to detect shallow clone instead of args.depth
112
- - clone: do not accept --depth on local clones
108
+ (merged to 'next' on 2010-08-23 at 8c364b2)
109
+ + Documentation: remove stray backslash in show-branch discussion
110
+ + Documentation: remove stray backslashes from "Fighting regressions" article
111
+ + Documentation: do not convert ... operator to ellipses
112
+ + Documentation: avoid stray backslash in user manual
113
+ + Documentation: avoid stray backslashes in core tutorial
114
+ + Documentation: remove stray backslashes in rev-parse manual
115
+ + Documentation: remove backslash before ~ in fast-import manual
116
+ + Documentation: remove stray backslash from "git bundle" manual
117
+ + Documentation/technical: avoid stray backslash in parse-options API docs
118
+ + Documentation: remove backslashes in manpage synopses
119
+ + Documentation: clarify quoting in gitignore docs
120
+ + Documentation: clarify quoting in "git rm" example
121
+ + Documentation: add missing quotes to "git grep" examples
122
+ + Documentation: clarify quoting in "git add" example
123
+ + Documentation: unbreak regex in show-ref manual
124
+ + Documentation: quoting trouble in "git rm" discussion
125
+ + Documentation: tweak description of log.date
126
+
127
+* nd/clone-depth-zero (2010-08-23) 1 commit
128
+ (merged to 'next' on 2010-08-26 at b4491c3)
129
+ + clone: warn users --depth is ignored in local clones
130
131
* cb/ignored-paths-are-precious (2010-08-21) 1 commit
132
- checkout/merge: optionally fail operation when ignored files need to be overwritten
@@ -127,53 +144,34 @@ this topic.
144
(merged to 'next' on 2010-08-21 at 5af7003)
145
+ fix >4GiB source delta assertion failure
146
130
---------------------------------------------------
131
-[Stalled]
132
-
133
-* jc/log-grep (2010-07-19) 1 commit
134
- - git log: add -G<regexp> that greps in the patch text
135
-
136
-This is broken, but haven't found any time to revisit it yet.
137
-
138
-* zl/mailinfo-recode-patch (2010-06-14) 2 commits
139
- - add --recode-patch option to git-am
140
- - add --recode-patch option to git-mailinfo
141
-
142
-I recall there was another round of re-roll planned for this one.
143
-
144
-* jk/tag-contains (2010-07-05) 4 commits
145
- - Why is "git tag --contains" so slow?
146
- - default core.clockskew variable to one day
147
- - limit "contains" traversals based on commit timestamp
148
- - tag: speed up --contains calculation
149
-
150
---------------------------------------------------
151
-[Cooking]
147
+Will merge to 'master' shortly.
148
149
* jn/apply-filename-with-sp (2010-08-18) 3 commits
154
- - apply: handle traditional patches with space in filename
155
- - tests: exercise "git apply" with weird filenames
156
- - apply: split quoted filename handling into new function
150
+ (merged to 'next' on 2010-08-26 at 4f60840)
151
+ + apply: handle traditional patches with space in filename
152
+ + tests: exercise "git apply" with weird filenames
153
+ + apply: split quoted filename handling into new function
154
155
* ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit
156
(merged to 'next' on 2010-08-21 at b09ee46)
157
+ reset: suggest what to do upon "git reset --mixed <paths>"
158
162
-Retitled.
159
+Will merge to 'master' shortly.
160
161
* cb/binary-patch-id (2010-08-15) 1 commit
162
(merged to 'next' on 2010-08-21 at ff38c3e)
163
+ hash binary sha1 into patch id
164
168
-* jj/icase-directory (2010-08-16) 6 commits
169
- - Support case folding in git fast-import when core.ignorecase=true
170
- - Support case folding for git add when core.ignorecase=true
171
- - Add case insensitivity support when using git ls-files
172
- - Add case insensitivity support for directories when using git status
173
- - Case insensitivity support for .gitignore via core.ignorecase
174
- - Add string comparison functions that respect the ignore_case variable.
165
+Will merge to 'master' shortly.
166
176
-Depends on GNU extension to fnmatch(3).
167
+* jj/icase-directory (2010-08-16) 6 commits
168
+ (merged to 'next' on 2010-08-26 at 9d8e1bc)
169
+ + Support case folding in git fast-import when core.ignorecase=true
170
+ + Support case folding for git add when core.ignorecase=true
171
+ + Add case insensitivity support when using git ls-files
172
+ + Add case insensitivity support for directories when using git status
173
+ + Case insensitivity support for .gitignore via core.ignorecase
174
+ + Add string comparison functions that respect the ignore_case variable.
175
176
* jn/cherry-revert-message-clean-up (2010-08-18) 5 commits
177
(merged to 'next' on 2010-08-21 at 09b123c)
@@ -184,7 +182,11 @@ Depends on GNU extension to fnmatch(3).
182
+ Eliminate “Finished cherry-pick/revert” message
183
(this branch uses cc/revert.)
184
187
-* jn/merge-custom-no-trivial (2010-08-15) 2 commits
185
+Will merge to 'master' shortly.
186
+
187
+* jn/merge-custom-no-trivial (2010-08-23) 3 commits
188
+ (merged to 'next' on 2010-08-24 at d9e5b2d)
189
+ + t7606: Avoid using head as a file name
190
(merged to 'next' on 2010-08-21 at 674498b)
191
+ merge: let custom strategies intervene in trivial merges
192
+ t7606 (merge-theirs): modernize style
@@ -192,7 +194,11 @@ Depends on GNU extension to fnmatch(3).
194
* po/etc-gitattributes (2010-08-16) 1 commit
195
- Add global and system-wide gitattributes
196
195
-* ab/compat-regex (2010-08-17) 7 commits
197
+* ab/compat-regex (2010-08-26) 9 commits
198
+ (merged to 'next' on 2010-08-26 at c5cc9d2)
199
+ + Fix compat/regex ANSIfication on MinGW
200
+ (merged to 'next' on 2010-08-22 at 40bce7c)
201
+ + autoconf: regex library detection typofix
202
(merged to 'next' on 2010-08-21 at 632d60f)
203
+ autoconf: don't use platform regex if it lacks REG_STARTEND
204
+ t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
@@ -202,18 +208,12 @@ Depends on GNU extension to fnmatch(3).
208
+ compat/regex: get the gawk regex engine to compile within git
209
+ compat/regex: use the regex engine from gawk for compat
210
205
-* ab/test-1 (2010-08-19) 5 commits
206
- - t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
207
- - test-lib: Allow overriding of TEST_DIRECTORY
208
- - test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
209
- - test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
210
- - Merge branch 'ab/i18n' into ab/test-1
211
- (this branch uses ab/i18n and ab/test.)
212
-
211
* da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit
212
(merged to 'next' on 2010-08-21 at e96772a)
213
+ submodule sync: Update "submodule.<name>.url"
214
215
+Will merge to 'master' shortly.
216
+
217
* jn/update-contrib-example-merge (2010-08-17) 24 commits
218
(merged to 'next' on 2010-08-21 at 41b5c4d)
219
+ merge script: learn --[no-]rerere-autoupdate
@@ -240,8 +240,16 @@ Depends on GNU extension to fnmatch(3).
240
+ t7600 (merge): do not launch gitk for --debug
241
+ t7600 (merge): modernize style
242
+ merge: do not mistake (ancestor of) tag for branch
243
-
244
-* ab/test (2010-08-16) 43 commits
243
+ (this branch is used by rr/fmt-merge-msg.)
244
+
245
+* ab/test (2010-08-24) 49 commits
246
+ (merged to 'next' on 2010-08-26 at fb6a7cf)
247
+ + tests: simplify "missing PREREQ" message
248
+ + t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
249
+ + test-lib: Allow overriding of TEST_DIRECTORY
250
+ + test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
251
+ + test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
252
+ + Merge branch 'ab/i18n' into ab/test-1
253
(merged to 'next' on 2010-08-18 at f88bdb1)
254
+ cvs tests: do not touch test CVS repositories shipped with source
255
+ t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
@@ -286,16 +294,14 @@ Depends on GNU extension to fnmatch(3).
294
+ test-lib: Print missing prerequisites in test output
295
+ test-lib: Add support for multiple test prerequisites
296
+ test-lib: Don't write test-results when HARNESS_ACTIVE
289
- (this branch is used by ab/test-1.)
290
-
291
-Previously many individual topic branches from the same author, all
292
-regarding tests. I thought it probably was ready for 'next' but was
293
-holding off as we seem to still keep getting many fixes on top.
297
+ (this branch uses ab/i18n.)
298
299
* dj/fetch-tagopt (2010-08-11) 1 commit
300
(merged to 'next' on 2010-08-21 at 737dfec)
301
+ fetch: allow command line --tags to override config
302
303
+Will merge to 'master' shortly.
304
+
305
* jn/paginate-fix (2010-08-16) 14 commits
306
(merged to 'next' on 2010-08-18 at bb04a13)
307
+ t7006 (pager): add missing TTY prerequisites
@@ -314,6 +320,8 @@ holding off as we seem to still keep getting many fixes on top.
320
+ git wrapper: introduce startup_info struct
321
(this branch uses jn/maint-setup-fix.)
322
323
+Will merge to 'master' shortly.
324
+
325
* jn/merge-renormalize (2010-08-05) 12 commits
326
(merged to 'next' on 2010-08-18 at d9aa77b)
327
+ merge-recursive --renormalize
@@ -328,32 +336,33 @@ holding off as we seem to still keep getting many fixes on top.
336
+ t6038 (merge.renormalize): check that it can be turned off
337
+ t6038 (merge.renormalize): try checkout -m and cherry-pick
338
+ t6038 (merge.renormalize): style nitpicks
331
- (this branch uses eb/double-convert-before-merge.)
339
+ (this branch is used by jf/merge-ignore-ws and jf/merge-ignore-ws; uses eb/double-convert-before-merge.)
340
341
* eb/double-convert-before-merge (2010-07-02) 3 commits
342
+ Don't expand CRLFs when normalizing text during merge
343
+ Try normalizing files to avoid delete/modify conflicts when merging
344
+ Avoid conflicts when merging branches with mixed normalization
337
- (this branch is used by jn/merge-renormalize.)
345
+ (this branch is used by jf/merge-ignore-ws and jn/merge-renormalize.)
346
347
* by/line-log (2010-08-11) 17 commits
340
- - Document line history browser
341
- - Add tests for line history browser
342
- - Add --full-line-diff option
343
- - Add --graph prefix before line history output
344
- - Add parent rewriting to line history browser
345
- - Make graph_next_line external to other part of git
346
- - Make rewrite_parents public to other part of git
347
- - Hook line history into cmd_log, ensuring a topo-ordered walk
348
- - Print the line log
349
- - map/take range to the parent of commits
350
- - Add range clone functions
351
- - Export three functions from diff.c
352
- - Parse the -L options
353
- - Refactor parse_loc
354
- - Add the basic data structure for line level history
355
- - parse-options: add two helper functions
356
- - parse-options: enhance STOP_AT_NON_OPTION
348
+ (merged to 'next' on 2010-08-26 at a160ff1)
349
+ + Document line history browser
350
+ + Add tests for line history browser
351
+ + Add --full-line-diff option
352
+ + Add --graph prefix before line history output
353
+ + Add parent rewriting to line history browser
354
+ + Make graph_next_line external to other part of git
355
+ + Make rewrite_parents public to other part of git
356
+ + Hook line history into cmd_log, ensuring a topo-ordered walk
357
+ + Print the line log
358
+ + map/take range to the parent of commits
359
+ + Add range clone functions
360
+ + Export three functions from diff.c
361
+ + Parse the -L options
362
+ + Refactor parse_loc
363
+ + Add the basic data structure for line level history
364
+ + parse-options: add two helper functions
365
+ + parse-options: enhance STOP_AT_NON_OPTION
366
367
Not entirely happy with the command line parser, but will merge to 'next'
368
after giving the series another look.
@@ -379,23 +388,26 @@ after giving the series another look.
388
+ Add memory pool library
389
+ Introduce vcs-svn lib
390
391
+Will merge to 'master' shortly.
392
+
393
* js/detached-stash (2010-08-21) 9 commits
383
- - detached-stash: update Documentation
384
- - detached-stash: tests of git stash with stash-like arguments
385
- - detached-stash: simplify git stash show
386
- - detached-stash: simplify git stash branch
387
- - detached-stash: refactor git stash pop implementation
388
- - detached-stash: simplify stash_drop
389
- - detached-stash: simplify stash_apply
390
- - detached-stash: work around git rev-parse failure to detect bad log refs
391
- - detached-stash: introduce parse_flags_and_revs function
392
-
393
-Rerolled again.
394
-
395
-* gb/shell-ext (2010-07-28) 3 commits
396
- - Add sample commands for git-shell
397
- - Add interactive mode to git-shell for user-friendliness
398
- - Allow creation of arbitrary git-shell commands
394
+ (merged to 'next' on 2010-08-26 at 7180a87)
395
+ + detached-stash: update Documentation
396
+ + detached-stash: tests of git stash with stash-like arguments
397
+ + detached-stash: simplify git stash show
398
+ + detached-stash: simplify git stash branch
399
+ + detached-stash: refactor git stash pop implementation
400
+ + detached-stash: simplify stash_drop
401
+ + detached-stash: simplify stash_apply
402
+ + detached-stash: work around git rev-parse failure to detect bad log refs
403
+ + detached-stash: introduce parse_flags_and_revs function
404
+
405
+* gb/shell-ext (2010-08-24) 4 commits
406
+ (merged to 'next' on 2010-08-24 at 49ea7b8)
407
+ + shell: Rewrite documentation and improve error message
408
+ + Add sample commands for git-shell
409
+ + Add interactive mode to git-shell for user-friendliness
410
+ + Allow creation of arbitrary git-shell commands
411
412
I am not very happy about adding these backdoors to git-shell, which is
413
primarily a security mechanism, and obviously security and backdoor do not
@@ -416,6 +428,8 @@ mix well.
428
+ t1501 (rev-parse): clarify
429
(this branch is used by jn/paginate-fix.)
430
431
+Will merge to 'master' shortly.
432
+
433
* tr/maint-no-unquote-plus (2010-07-24) 1 commit
434
(merged to 'next' on 2010-08-18 at b811248)
435
+ Do not unquote + into ' ' in URLs
@@ -423,6 +437,8 @@ mix well.
437
I think this one is safe in the context of git (namely smart-http
438
interface).
439
440
+Will merge to 'master' shortly.
441
+
442
* cc/revert (2010-07-21) 5 commits
443
(merged to 'next' on 2010-08-14 at a910d5a)
444
+ t3508: add check_head_differs_from() helper function and use it
@@ -437,10 +453,14 @@ interface).
453
+ fast-export: Add a --full-tree option
454
+ fast-export: Fix dropping of files with --import-marks and path limiting
455
456
+Will merge to 'master' shortly.
457
+
458
* hv/autosquash-config (2010-07-14) 1 commit
459
(merged to 'next' on 2010-08-18 at 03a8eec)
460
+ add configuration variable for --autosquash option of interactive rebase
461
462
+Will merge to 'master' shortly.
463
+
464
* il/rfc-remote-fd-ext (2010-08-14) 6 commits
465
- Fix build on Windows
466
- Simplify send_git_request()
@@ -449,14 +469,13 @@ interface).
469
- New remote helper: git-remote-ext
470
- New remote helper git-remote-fd
471
452
-I haven't heard anything about this series. Is it desirable? Or is it
453
-not used by anybody and just another baggage we'd rather not carry?
454
-
472
* sg/rerere-gc-old-still-used (2010-07-13) 2 commits
473
(merged to 'next' on 2010-08-18 at 8bc4635)
474
+ rerere: fix overeager gc
475
+ mingw_utime(): handle NULL times parameter
476
477
+Will merge to 'master' shortly.
478
+
479
* en/d-f-conflict-fix (2010-08-20) 12 commits
480
(merged to 'next' on 2010-08-20 at af7f2b0)
481
+ merge-recursive: Avoid excessive output for and reprocessing of renames
@@ -475,25 +494,11 @@ not used by anybody and just another baggage we'd rather not carry?
494
+ Add a rename + D/F conflict testcase
495
+ Add additional testcases for D/F conflicts
496
478
-* ab/i18n (2010-07-25) 4 commits
479
- - tests: locate i18n lib&data correctly under --valgrind
480
- - gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
481
- - tests: rename test to work around GNU gettext bug
482
- - Add infrastructure for translating Git with gettext
483
- (this branch is used by ab/test-1.)
484
-
485
---------------------------------------------------
486
-[Ejected]
487
-
488
-* jn/commit-no-change-wo-status (2010-08-11) 10 commits
489
- . t6040 (branch tracking): check “status” instead of “commit”
490
- . commit: suppress status summary when no changes staged
491
- . commit --dry-run: give advice on empty amend
492
- . commit: give empty-commit avoidance code its own function
493
- . t7508 (status): modernize style
494
- . commit: split off the piece that writes status
495
- . commit: split commit -s handling into its own function
496
- . commit: split off a function to fetch the default log message
497
- . wt-status: split off a function for printing submodule summary
498
- . wt-status: split wt_status_print into digestible pieces
497
+Will merge to 'master' shortly.
498
499
+* ab/i18n (2010-07-25) 4 commits
500
+ + tests: locate i18n lib&data correctly under --valgrind
501
+ + gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
502
+ + tests: rename test to work around GNU gettext bug
503
+ + Add infrastructure for translating Git with gettext
504
+ (this branch is used by ab/test.)