What's cooking (2012/07 #05)
Junio C Hamano committed
Jul 15, 2012 at 22:32 UTC
0b30d5504a602ef409b9bf3873acba8abb24cf9c
1 file changed
+180
-261
whats-cooking.txt
+180
-261
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2012, #04; Fri, 13)
3
-X-master-at: 48c42ff66244f754cc02d9bcca0962c791c7d57e
4
-X-next-at: 534e6fe3169c23d847bc59311217dedfc6669bc1
2
+Subject: What's cooking in git.git (Jul 2012, #05; Sun, 15)
3
+X-master-at: 31c79549b85c6393be4f40432f5b86ebc097fc7e
4
+X-next-at: fdb3850c586fd1eced5e0456ef599f9c0c9191d9
5
6
-What's cooking in git.git (Jul 2012, #04; Fri, 13)
6
+What's cooking in git.git (Jul 2012, #05; Sun, 15)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -17,151 +17,133 @@ repositories listed at
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
20
-[Graduated to "master"]
20
+[New Topics]
21
22
-* jc/refactor-diff-stdin (2012-06-28) 3 commits
23
- (merged to 'next' on 2012-07-09 at ef407ee)
24
- + diff-index.c: "git diff" has no need to read blob from the standard input
25
- + diff-index.c: unify handling of command line paths
26
- + diff-index.c: do not pretend paths are pathspecs
27
-
28
-Due to the way "git diff --no-index" is bolted onto by touching the
29
-low level code that is shared with the rest of the "git diff" code,
30
-even though it has to work in a very different way, any comparison
31
-that involves a file "-" at the root level incorrectly tried to read
32
-from the standard input. This cleans up the no-index codepath
33
-further to remove code that reads from the standard input from the
34
-core side, which is never necessary when git is running its usual
35
-diff operation.
36
-
37
-* jn/vcs-svn (2012-07-05) 12 commits
38
- (merged to 'next' on 2012-07-09 at 1d97a8f)
39
- + vcs-svn: allow 64-bit Prop-Content-Length
40
- + vcs-svn: suppress a signed/unsigned comparison warning
41
- + vcs-svn: suppress a signed/unsigned comparison warning
42
- + vcs-svn: suppress signed/unsigned comparison warnings
43
- + vcs-svn: use strstr instead of memmem
44
- + vcs-svn: use constcmp instead of prefixcmp
45
- + vcs-svn: simplify cleanup in apply_one_window
46
- + vcs-svn: avoid self-assignment in dummy initialization of pre_off
47
- + vcs-svn: drop no-op reset methods
48
- + vcs-svn: suppress -Wtype-limits warning
49
- + vcs-svn: allow import of > 4GiB files
50
- + vcs-svn: rename check_overflow and its arguments for clarity
51
-
52
-Reroll of db/vcs-svn.
53
-
54
-* mm/mediawiki-file-attachments (2012-07-04) 6 commits
55
- (merged to 'next' on 2012-07-09 at 4b85fa2)
56
- + git-remote-mediawiki: improve support for non-English Wikis
57
- (merged to 'next' on 2012-07-03 at 90f2f45)
58
- + git-remote-mediawiki: import "File:" attachments
59
- + git-remote-mediawiki: split get_mw_pages into smaller functions
60
- + git-remote-mediawiki: send "File:" attachments to a remote wiki
61
- + git-remote-mediawiki: don't "use encoding 'utf8';"
62
- + git-remote-mediawiki: don't compute the diff when getting commit message
63
- (this branch is used by mm/mediawiki-tests.)
64
-
65
-"mediawiki" remote helper (in contrib/) learned to handle file
66
-attachments.
67
-
68
-* mm/mediawiki-tests (2012-07-06) 12 commits
69
- (merged to 'next' on 2012-07-09 at 4d874e8)
70
- + git-remote-mediawiki: be more defensive when requests fail
71
- + git-remote-mediawiki: more efficient 'pull' in the best case
72
- + git-remote-mediawiki: extract revision-importing loop to a function
73
- + git-remote-mediawiki: refactor loop over revision ids
74
- + git-remote-mediawiki: change return type of get_mw_pages
75
- + git-remote-mediawiki (t9363): test 'File:' import and export
76
- + git-remote-mediawiki: support for uploading file in test environment
77
- + git-remote-mediawiki (t9362): test git-remote-mediawiki with UTF8 characters
78
- + git-remote-mediawiki (t9361): test git-remote-mediawiki pull and push
79
- + git-remote-mediawiki (t9360): test git-remote-mediawiki clone
80
- + git-remote-mediawiki: test environment of git-remote-mediawiki
81
- + git-remote-mediawiki: scripts to install, delete and clear a MediaWiki
82
- (this branch uses mm/mediawiki-file-attachments.)
83
-
84
-* mz/rebase-no-mbox (2012-06-26) 4 commits
85
- (merged to 'next' on 2012-07-03 at 5bf5c12)
86
- + am: don't call mailinfo if $rebasing
87
- + am --rebasing: get patch body from commit, not from mailbox
88
- + rebase --root: print usage on too many args
89
- + rebase: don't source git-sh-setup twice
90
-
91
-Teach "am --rebasing" codepath to grab authorship, log message and
92
-the patch text directly out of existing commits. This will help
93
-rebasing commits that have confusing "diff" output in their log
94
-messages.
95
-
96
-* tb/sanitize-decomposed-utf-8-pathname (2012-07-08) 1 commit
97
- (merged to 'next' on 2012-07-09 at 61b12c2)
98
- + git on Mac OS and precomposed unicode
99
-
100
-Teaches git to normalize pathnames read from readdir(3) and all
101
-arguments from the command line into precomposed UTF-8 (assuming
102
-that they come as decomposed UTF-8) to work around issues on Mac OS.
103
-
104
-I think there still are other places that need conversion
105
-(e.g. paths that are read from stdin for some commands), but this
106
-should be a good first step in the right direction.
107
-
108
-* tg/ce-namelen (2012-07-08) 1 commit
109
- (merged to 'next' on 2012-07-10 at 87755d8)
110
- + Replace strlen() with ce_namelen()
111
-
112
-Trivially correct clean-up and micro optimization.
113
-
114
-* tr/maint-show-walk (2012-06-19) 2 commits
115
- (merged to 'next' on 2012-07-09 at c8e0e06)
116
- + show: fix "range implies walking"
117
- + Demonstrate git-show is broken with ranges
118
-
119
-Fixes "git show"'s auto-walking behaviour, and make it behave just
120
-like "git log" does when it walks.
121
-
122
-Note that this is different from Thomas's patch.
22
+* sn/doc-typofix (2012-07-14) 1 commit
23
+ - doc: A few minor copy edits.
24
25
--------------------------------------------------
125
-[New Topics]
26
+[Graduated to "master"]
27
127
-* as/t4012-style-updates (2012-07-12) 7 commits
128
- - t4012: use 'printf' instead of 'dd' to generate a binary file
129
- - t4012: Re-indent test snippets
130
- - t4012: Make --shortstat test more robust
131
- - t4012: Break up pipe into serial redirections
132
- - t4012: Actually quote the sed script
133
- - t4012: Unquote git command fragment in test title
134
- - t4012: modernize style for quoting
28
+* ar/clone-honor-umask-at-top (2012-07-09) 3 commits
29
+ (merged to 'next' on 2012-07-10 at 680bc22)
30
+ + add: create ADD_EDIT.patch with mode 0666
31
+ + rerere: make rr-cache fanout directory honor umask
32
+ + Restore umasks influence on the permissions of work tree created by clone
33
136
-Should I wait for a reroll???
34
+A handful of files and directories we create had tighter than
35
+necessary permission bits when the user wanted to have group
36
+writability (e.g. by setting "umask 002").
37
138
-* jl/maint-1.7.10-recurse-submodules-with-symlink (2012-07-12) 1 commit
139
- - submodules: don't stumble over symbolic links when cloning recursively
38
+* cw/amend-commit-without-message (2012-07-09) 1 commit
39
+ (merged to 'next' on 2012-07-10 at e7c75d5)
40
+ + Allow edit of empty message with commit --amend
41
141
-When "git submodule add" clones a submodule repository, it can get
142
-confused where to store the resulting submodule repository in the
143
-superproject's .git/ directory when there is a symbolic link in the
144
-path to the current directory.
42
+"commit --amend" used to refuse amending a commit with an empty log
43
+message, with or without "--allow-empty-message".
44
146
-* mm/config-xdg (2012-07-12) 2 commits
147
- - fixup! config: fix several access(NULL) calls
148
- - config: fix several access(NULL) calls
45
+* cw/rebase-i-root (2012-07-05) 3 commits
46
+ (merged to 'next' on 2012-07-05 at aeb4c56)
47
+ + t3404: make test 57 work with dash and others
48
+ (merged to 'next' on 2012-07-03 at 231c0a4)
49
+ + Add tests for rebase -i --root without --onto
50
+ + rebase -i: support --root without --onto
51
150
-Either we do the stupid literal conversion (shown in fixup!), or the
151
-reason why we special case missing HOME needs to be better explained.
52
+"git rebase [-i] --root $tip" can now be used to rewrite all the
53
+history down to the root.
54
153
-* jk/revision-walk-stop-at-max-count (2012-07-13) 1 commit
154
- - revision: avoid work after --max-count is reached
55
+* jc/apply-3way (2012-07-09) 19 commits
56
+ (merged to 'next' on 2012-07-10 at fb5c872)
57
+ + apply: tests for the --3way option
58
+ + apply: document --3way option
59
+ + apply: allow rerere() to work on --3way results
60
+ + apply: register conflicted stages to the index
61
+ + apply: --3way with add/add conflict
62
+ + apply: move verify_index_match() higher
63
+ + apply: plug the three-way merge logic in
64
+ + apply: fall back on three-way merge
65
+ + apply: accept -3/--3way command line option
66
+ + apply: move "already exists" logic to check_to_create()
67
+ + apply: move check_to_create_blob() closer to its sole caller
68
+ + apply: further split load_preimage()
69
+ + apply: refactor "previous patch" logic
70
+ + apply: split load_preimage() helper function out
71
+ + apply: factor out checkout_target() helper function
72
+ + apply: refactor read_file_or_gitlink()
73
+ + apply: clear_image() clears things a bit more
74
+ + apply: a bit more comments on PATH_TO_BE_DELETED
75
+ + apply: fix an incomplete comment in check_patch()
76
156
-"git log -n 1 -- rarely-touched-path" was spending unnecessary
157
-cycles after showing the first change to find the next one, only to
158
-discard it.
77
+"git apply" learns to wiggle the base version and perform three-way merge
78
+when a patch does not exactly apply to the version you have.
79
160
-* pg/maint-1.7.9-am-where-is-patch (2012-07-13) 1 commit
161
- - am: indicate where a failed patch is to be found
80
+* jk/index-pack-streaming-fix (2012-07-10) 1 commit
81
+ (merged to 'next' on 2012-07-13 at c575338)
82
+ + index-pack: loop while inflating objects in unpack_data
83
163
-When "git am" failed, old timers knew to check .git/rebase-apply/patch
164
-to see what went wrong, but we never told the users about it.
84
+The streaming index-pack introduced in 1.7.11 had a data corruption
85
+bug, and this should fix it.
86
+
87
+* jk/maint-commit-amend-only-no-paths (2012-07-10) 1 commit
88
+ (merged to 'next' on 2012-07-10 at 1c650c2)
89
+ + commit: fix "--amend --only" with no pathspec
90
+
91
+"git commit --amend --only --" was meant to allow "Clever" people to
92
+rewrite the commit message without making any change even when they
93
+have already changes for the next commit added to their index, but
94
+it never worked as advertised since it was introduced in 1.3.0 era.
95
+
96
+* jk/push-delete-ref-error-message (2012-07-03) 1 commit
97
+ (merged to 'next' on 2012-07-09 at 82c6bd2)
98
+ + push: don't guess at qualifying remote refs on deletion
99
+
100
+The error message from "git push $there :bogo" mentioned we tried
101
+and failed to guess what ref is being deleted based on the LHS of
102
+the refspec, which we don't.
103
+
104
+* jn/makefile-cleanup (2012-07-09) 14 commits
105
+ (merged to 'next' on 2012-07-10 at f55e6a1)
106
+ + Makefile: document ground rules for target-specific dependencies
107
+ + Makefile: move GIT-VERSION-FILE dependencies closer to use
108
+ + Makefile: build instaweb similar to other scripts
109
+ + Makefile: update scripts when build-time parameters change
110
+ + Makefile: do not replace @@GIT_VERSION@@ in shell scripts
111
+ + Makefile: split prefix flags from GIT-CFLAGS
112
+ + Makefile: be silent when only GIT_USER_AGENT changes
113
+ + Makefile: split GIT_USER_AGENT from GIT-CFLAGS
114
+ + Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
115
+ + Makefile: apply dependencies consistently to sparse/asm targets
116
+ + Makefile: do not have git.o depend on common-cmds.h
117
+ + Makefile: fold XDIFF_H and VCSSVN_H into LIB_H
118
+ + Makefile: fold MISC_H into LIB_H
119
+ + Makefile: sort LIB_H list
120
+
121
+Tightens dependency rules to avoid unnecessary recompilation.
122
+
123
+* pw/git-p4-jobs (2012-07-05) 3 commits
124
+ (merged to 'next' on 2012-07-10 at c6ef8f9)
125
+ + git p4: notice Jobs lines in git commit messages
126
+ + git p4 test: refactor marshal_dump
127
+ + git p4: remove unused P4Submit interactive setting
128
+
129
+Teach "git p4" to notice "Jobs:" in the log message and relay it to
130
+Perforce to trigger its "jobs" support.
131
+
132
+* pw/git-p4-move (2012-07-12) 2 commits
133
+ (merged to 'next' on 2012-07-13 at 648a8ad)
134
+ + git p4: add support for 'p4 move' in P4Submit
135
+ + git p4: refactor diffOpts calculation
136
+
137
+* tg/maint-cache-name-compare (2012-07-11) 1 commit
138
+ (merged to 'next' on 2012-07-13 at 0d07ddc)
139
+ + cache_name_compare(): do not truncate while comparing paths
140
+ (this branch is used by tg/ce-namelen-field.)
141
+
142
+Even though the index can record pathnames longer than 1<<12 bytes,
143
+in some places we were not comparing them in full, potentially
144
+replacing index entries instead of adding.
145
+
146
+Will merge down to older maintenance releases.
147
148
--------------------------------------------------
149
[Stalled]
@@ -208,6 +190,51 @@ not working :-(.
190
--------------------------------------------------
191
[Cooking]
192
193
+* as/t4012-style-updates (2012-07-12) 7 commits
194
+ - t4012: use 'printf' instead of 'dd' to generate a binary file
195
+ - t4012: Re-indent test snippets
196
+ - t4012: Make --shortstat test more robust
197
+ - t4012: Break up pipe into serial redirections
198
+ - t4012: Actually quote the sed script
199
+ - t4012: Unquote git command fragment in test title
200
+ - t4012: modernize style for quoting
201
+
202
+Expecting a reroll.
203
+
204
+* jl/maint-1.7.10-recurse-submodules-with-symlink (2012-07-12) 1 commit
205
+ - submodules: don't stumble over symbolic links when cloning recursively
206
+
207
+When "git submodule add" clones a submodule repository, it can get
208
+confused where to store the resulting submodule repository in the
209
+superproject's .git/ directory when there is a symbolic link in the
210
+path to the current directory.
211
+
212
+Will merge to 'next'.
213
+
214
+* mm/config-xdg (2012-07-12) 2 commits
215
+ - fixup! config: fix several access(NULL) calls
216
+ - config: fix several access(NULL) calls
217
+
218
+Either we do the stupid literal conversion (shown in fixup!), or the
219
+reason why we special case missing HOME needs to be better explained.
220
+
221
+* jk/revision-walk-stop-at-max-count (2012-07-13) 1 commit
222
+ - revision: avoid work after --max-count is reached
223
+
224
+"git log -n 1 -- rarely-touched-path" was spending unnecessary
225
+cycles after showing the first change to find the next one, only to
226
+discard it.
227
+
228
+Will merge to 'next'.
229
+
230
+* pg/maint-1.7.9-am-where-is-patch (2012-07-13) 1 commit
231
+ - am: indicate where a failed patch is to be found
232
+
233
+When "git am" failed, old timers knew to check .git/rebase-apply/patch
234
+to see what went wrong, but we never told the users about it.
235
+
236
+Will merge to 'next'.
237
+
238
* jc/maint-filter-branch-epoch-date (2012-07-12) 3 commits
239
(merged to 'next' on 2012-07-13 at d144342)
240
+ t7003: add test to filter a branch with a commit at epoch
@@ -219,22 +246,7 @@ In 1.7.9 era, we taught "git rebase" about the raw timestamp format
246
but we did not teach the same trick to "filter-branch", which rolled
247
a similar logic on its own.
248
222
-* jk/maint-commit-amend-only-no-paths (2012-07-10) 1 commit
223
- (merged to 'next' on 2012-07-10 at 1c650c2)
224
- + commit: fix "--amend --only" with no pathspec
225
-
226
-"git commit --amend --only --" was meant to allow "Clever" people to
227
-rewrite the commit message without making any change even when they
228
-have already changes for the next commit added to their index, but
229
-it never worked as advertised since it was introduced in 1.3.0 era.
230
-
231
-* jk/index-pack-streaming-fix (2012-07-10) 1 commit
232
- - index-pack: loop while inflating objects in unpack_data
233
-
234
-The streaming index-pack introduced in 1.7.11 had a data corruption
235
-bug, and this should fix it.
236
-
237
-Will merge to 'next'.
249
+Will merge to 'master'.
250
251
* mb/remote-default-nn-origin (2012-07-11) 6 commits
252
- Teach get_default_remote to respect remote.default.
@@ -248,49 +260,17 @@ When the user does not specify what remote to interact with, we
260
often attempt to use 'origin'. This can now be customized via a
261
configuration variable.
262
263
+Expecting a reroll.
264
+"The first remote becomes the default" bit is better done as a
265
+separate step.
266
+
267
* tg/ce-namelen-field (2012-07-11) 2 commits
268
- Strip namelen out of ce_flags into a ce_namelen field
269
- Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field
254
- (this branch uses tg/maint-cache-name-compare.)
270
271
Split lower bits of ce_flags field and creates a new ce_namelen
272
field in the in-core index structure.
273
259
-* tg/maint-cache-name-compare (2012-07-11) 1 commit
260
- - cache_name_compare(): do not truncate while comparing paths
261
- (this branch is used by tg/ce-namelen-field.)
262
-
263
-Even though the index can record pathnames longer than 1<<12 bytes,
264
-in some places we were not comparing them in full, potentially
265
-replacing index entries instead of adding.
266
-
267
-Will merge to 'next', and then later down to older maintenance releases.
268
-
269
-* jc/apply-3way (2012-07-09) 19 commits
270
- (merged to 'next' on 2012-07-10 at fb5c872)
271
- + apply: tests for the --3way option
272
- + apply: document --3way option
273
- + apply: allow rerere() to work on --3way results
274
- + apply: register conflicted stages to the index
275
- + apply: --3way with add/add conflict
276
- + apply: move verify_index_match() higher
277
- + apply: plug the three-way merge logic in
278
- + apply: fall back on three-way merge
279
- + apply: accept -3/--3way command line option
280
- + apply: move "already exists" logic to check_to_create()
281
- + apply: move check_to_create_blob() closer to its sole caller
282
- + apply: further split load_preimage()
283
- + apply: refactor "previous patch" logic
284
- + apply: split load_preimage() helper function out
285
- + apply: factor out checkout_target() helper function
286
- + apply: refactor read_file_or_gitlink()
287
- + apply: clear_image() clears things a bit more
288
- + apply: a bit more comments on PATH_TO_BE_DELETED
289
- + apply: fix an incomplete comment in check_patch()
290
-
291
-"git apply" learns to wiggle the base version and perform three-way merge
292
-when a patch does not exactly apply to the version you have.
293
-
274
* jl/submodule-rm (2012-07-05) 2 commits
275
- rm: remove submodules from the index and the .gitmodules file
276
- rm: don't fail when removing populated submodules
@@ -304,36 +284,15 @@ Expecting a reroll.
284
Expecting a reroll of the tip one.
285
286
* nk/maint-gitweb-log-by-lines (2012-07-05) 3 commits
307
- - gitweb: Add support to Link: tag
308
- - gitweb: Handle other types of tag in git_print_log
309
- - gitweb: Cleanup git_print_log()
310
-
311
-Needs to be eyeballed for the correctness of the esc_html() in the tip one.
287
+ (merged to 'next' on 2012-07-13 at 780e16a)
288
+ + gitweb: Add support to Link: tag
289
+ + gitweb: Handle other types of tag in git_print_log
290
+ + gitweb: Cleanup git_print_log()
291
313
-* pw/git-p4-jobs (2012-07-05) 3 commits
314
- (merged to 'next' on 2012-07-10 at c6ef8f9)
315
- + git p4: notice Jobs lines in git commit messages
316
- + git p4 test: refactor marshal_dump
317
- + git p4: remove unused P4Submit interactive setting
318
-
319
-Teach "git p4" to notice "Jobs:" in the log message and relay it to
320
-Perforce to trigger its "jobs" support.
321
-
322
-* pw/git-p4-move (2012-07-12) 2 commits
323
- - git p4: add support for 'p4 move' in P4Submit
324
- - git p4: refactor diffOpts calculation
325
-
326
-Will merge to 'next'.
327
-
328
-* ar/clone-honor-umask-at-top (2012-07-09) 3 commits
329
- (merged to 'next' on 2012-07-10 at 680bc22)
330
- + add: create ADD_EDIT.patch with mode 0666
331
- + rerere: make rr-cache fanout directory honor umask
332
- + Restore umasks influence on the permissions of work tree created by clone
292
+Teach gitweb to pay attention to various forms of credits that are
293
+similar to "Signed-off-by:" lines.
294
334
-A handful of files and directories we create had tighter than
335
-necessary permission bits when the user wanted to have group
336
-writability (e.g. by setting "umask 002").
295
+Needs to be eyeballed for the correctness of the esc_html() in the tip one.
296
297
* ph/stash-rerere (2012-07-08) 2 commits
298
- stash: invoke rerere in case of conflict
@@ -341,50 +300,6 @@ writability (e.g. by setting "umask 002").
300
301
Will be rerolled but is going in the right direction.
302
344
-* jn/makefile-cleanup (2012-07-09) 14 commits
345
- (merged to 'next' on 2012-07-10 at f55e6a1)
346
- + Makefile: document ground rules for target-specific dependencies
347
- + Makefile: move GIT-VERSION-FILE dependencies closer to use
348
- + Makefile: build instaweb similar to other scripts
349
- + Makefile: update scripts when build-time parameters change
350
- + Makefile: do not replace @@GIT_VERSION@@ in shell scripts
351
- + Makefile: split prefix flags from GIT-CFLAGS
352
- + Makefile: be silent when only GIT_USER_AGENT changes
353
- + Makefile: split GIT_USER_AGENT from GIT-CFLAGS
354
- + Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
355
- + Makefile: apply dependencies consistently to sparse/asm targets
356
- + Makefile: do not have git.o depend on common-cmds.h
357
- + Makefile: fold XDIFF_H and VCSSVN_H into LIB_H
358
- + Makefile: fold MISC_H into LIB_H
359
- + Makefile: sort LIB_H list
360
-
361
-Tightens dependency rules to avoid unnecessary recompilation.
362
-
363
-* cw/amend-commit-without-message (2012-07-09) 1 commit
364
- (merged to 'next' on 2012-07-10 at e7c75d5)
365
- + Allow edit of empty message with commit --amend
366
-
367
-"commit --amend" used to refuse amending a commit with an empty log
368
-message, with or without "--allow-empty-message".
369
-
370
-* jk/push-delete-ref-error-message (2012-07-03) 1 commit
371
- (merged to 'next' on 2012-07-09 at 82c6bd2)
372
- + push: don't guess at qualifying remote refs on deletion
373
-
374
-The error message from "git push $there :bogo" mentioned we tried
375
-and failed to guess what ref is being deleted based on the LHS of
376
-the refspec, which we don't.
377
-
378
-* cw/rebase-i-root (2012-07-05) 3 commits
379
- (merged to 'next' on 2012-07-05 at aeb4c56)
380
- + t3404: make test 57 work with dash and others
381
- (merged to 'next' on 2012-07-03 at 231c0a4)
382
- + Add tests for rebase -i --root without --onto
383
- + rebase -i: support --root without --onto
384
-
385
-"git rebase [-i] --root $tip" can now be used to rewrite all the
386
-history down to the root.
387
-
303
* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit
304
- commit/commit-tree: correct latin1 to utf-8
305
@@ -394,7 +309,7 @@ pass it through convert-from-latin1-to-utf8 and see if it makes
309
sense" heuristics "git mailinfo" already uses.
310
311
A draft from Linus received privately without a log message.
397
-Hopefully it will be rerolled.
312
+Expecting a reroll.
313
314
* jc/test-lib-source-build-options-early (2012-06-24) 1 commit
315
- test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
@@ -407,6 +322,8 @@ one of its early operations.
322
Needs to be eyeballed by people who run tests with exotic options
323
like valgrind, --root=/dev/shm/somewhere, etc.
324
325
+Will merge to 'next'.
326
+
327
* jc/sha1-name-more (2012-07-13) 27 commits
328
(merged to 'next' on 2012-07-13 at 534e6fe)
329
+ t1512: match the "other" object names
@@ -444,6 +361,8 @@ is always a commit object, "A" in "git log A" must be a committish,
361
and "A" and "B" in "git log A...B" both must be committish, etc., to
362
prolong the lifetime of abbreviated object names.
363
364
+Will merge to 'master'.
365
+
366
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
367
- pager: drop "wait for output to run less" hack
368