What's cooking (2013/09 #03)
Junio C Hamano committed
Sep 11, 2013 at 16:25 UTC
68ec68e4b1b93722627de73ec5841a4d72c54ee6
1 file changed
+280
-731
whats-cooking.txt
+280
-731
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2013, #02; Mon, 9)
4
-X-master-at: bb80ee09974667a1db6bbc5e33574ed869b76a88
5
-X-next-at: 117d2e3ab92364a7d246c98cc5b71f2b751600e6
3
+Subject: What's cooking in git.git (Sep 2013, #03; Wed, 11)
4
+X-master-at: a194eaddca201163aa756faccd519f056bd3c35e
5
+X-next-at: 424cb083fbc33c0ccd89e8d591920f438eab564d
6
7
-What's cooking in git.git (Sep 2013, #02; Mon, 9)
7
+What's cooking in git.git (Sep 2013, #03; Wed, 11)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -21,532 +21,306 @@ of the repositories listed at
21
--------------------------------------------------
22
[Graduated to "master"]
23
24
-* aj/p4-symlink-lose-nl (2013-08-12) 1 commit
25
- (merged to 'next' on 2013-08-28 at 5ce9ceb)
26
- + git-p4: Fix occasional truncation of symlink contents.
27
-
28
- Originally merged to 'next' on 2013-08-14
29
-
30
-
31
-* ap/remote-hg-tilde-is-home-directory (2013-08-09) 1 commit
32
- (merged to 'next' on 2013-08-28 at 9bfc430)
33
- + remote-hg: fix path when cloning with tilde expansion
34
-
35
- Originally merged to 'next' on 2013-08-14
36
-
37
-
38
-* bc/unuse-packfile (2013-08-02) 2 commits
39
- (merged to 'next' on 2013-08-28 at 9029801)
40
- + Don't close pack fd when free'ing pack windows
41
- + sha1_file: introduce close_one_pack() to close packs on fd pressure
42
-
43
- Originally merged to 'next' on 2013-08-06
44
-
45
- Handle memory pressure and file descriptor pressure separately when
46
- deciding to release pack windows to honor resource limits.
47
-
48
-
49
-* da/darwin (2013-08-05) 3 commits
50
- (merged to 'next' on 2013-08-28 at 6e4c5ae)
51
- + OS X: Fix redeclaration of die warning
52
- + Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
53
- + imap-send: use Apple's Security framework for base64 encoding
24
+* es/rebase-i-no-abbrev (2013-08-25) 3 commits
25
+ (merged to 'next' on 2013-09-04 at 6027805)
26
+ + rebase -i: fix short SHA-1 collision
27
+ + t3404: rebase -i: demonstrate short SHA-1 collision
28
+ + t3404: make tests more self-contained
29
55
- Originally merged to 'next' on 2013-08-05
30
+ Originally merged to 'next' on 2013-08-26
31
32
+ The commit object names in the insn sheet that was prepared at the
33
+ beginning of "rebase -i" session can become ambiguous as the
34
+ rebasing progresses and the repository gains more commits. Make
35
+ sure the internal record is kept with full 40-hex object names.
36
58
-* db/http-savecookies (2013-08-05) 2 commits
59
- (merged to 'next' on 2013-08-28 at 22a8464)
60
- + t5551: Remove header from curl cookie file
61
- + http: add http.savecookies option to write out HTTP cookies
37
63
- Originally merged to 'next' on 2013-08-05
38
+* es/rebase-i-respect-core-commentchar (2013-08-18) 1 commit
39
+ (merged to 'next' on 2013-09-04 at 8c1ce68)
40
+ + rebase -i: fix cases ignoring core.commentchar
41
42
+ Originally merged to 'next' on 2013-08-20
43
66
-* es/blame-L-more (2013-08-05) 11 commits
67
- (merged to 'next' on 2013-08-28 at b73cdc9)
68
- + blame: reject empty ranges -L,+0 and -L,-0
69
- + t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0
70
- + blame: reject empty ranges -LX,+0 and -LX,-0
71
- + t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0
72
- + log: fix -L bounds checking bug
73
- + t4211: retire soon-to-be unimplementable tests
74
- + t4211: log: demonstrate -L bounds checking bug
75
- + blame: fix -L bounds checking bug
76
- + t8001/t8002: blame: add empty file & partial-line tests
77
- + t8001/t8002: blame: demonstrate -L bounds checking bug
78
- + t8001/t8002: blame: decompose overly-large test
79
- (this branch is used by es/blame-L-twice and es/contacts-blame-L-multi.)
44
+ "rebase -i" forgot that the comment character can be configurable
45
+ while reading its insn sheet.
46
81
- Originally merged to 'next' on 2013-08-06
47
83
- More fixes to the code to parse the "-L" option in "log" and "blame".
48
+* jc/ls-files-killed-optim (2013-08-23) 4 commits
49
+ (merged to 'next' on 2013-09-04 at 20c2304)
50
+ + dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
51
+ + t3010: update to demonstrate "ls-files -k" optimization pitfalls
52
+ + ls-files -k: a directory only can be killed if the index has a non-directory
53
+ + dir.c: use the cache_* macro to access the current index
54
55
+ Originally merged to 'next' on 2013-08-27
56
86
-* es/blame-L-twice (2013-08-06) 16 commits
87
- (merged to 'next' on 2013-08-28 at e83ae2e)
88
- + line-range: reject -L line numbers less than 1
89
- + t8001/t8002: blame: add tests of -L line numbers less than 1
90
- + line-range: teach -L^:RE to search from start of file
91
- + line-range: teach -L:RE to search from end of previous -L range
92
- + line-range: teach -L^/RE/ to search from start of file
93
- + line-range-format.txt: document -L/RE/ relative search
94
- + log: teach -L/RE/ to search from end of previous -L range
95
- + blame: teach -L/RE/ to search from end of previous -L range
96
- + line-range: teach -L/RE/ to search relative to anchor point
97
- + blame: document multiple -L support
98
- + t8001/t8002: blame: add tests of multiple -L options
99
- + blame: accept multiple -L ranges
100
- + blame: inline one-line function into its lone caller
101
- + range-set: publish API for re-use by git-blame -L
102
- + line-range-format.txt: clarify -L:regex usage form
103
- + git-log.txt: place each -L option variation on its own line
104
- (this branch is used by es/contacts-blame-L-multi; uses es/blame-L-more.)
57
+ "git ls-files -k" needs to crawl only the part of the working tree
58
+ that may overlap the paths in the index to find killed files, but
59
+ shared code with the logic to find all the untracked files, which
60
+ made it unnecessarily inefficient.
61
106
- Originally merged to 'next' on 2013-08-08
62
108
- Teaches "git blame" to take more than one -L ranges.
63
+* jn/post-receive-utf8 (2013-08-05) 3 commits
64
+ (merged to 'next' on 2013-09-04 at 3a3f480)
65
+ + hooks/post-receive-email: set declared encoding to utf-8
66
+ + hooks/post-receive-email: force log messages in UTF-8
67
+ + hooks/post-receive-email: use plumbing instead of git log/show
68
69
+ Originally merged to 'next' on 2013-08-20
70
111
-* es/contacts-blame-L-multi (2013-08-13) 3 commits
112
- (merged to 'next' on 2013-08-28 at 24ff8b4)
113
- + contacts: reduce git-blame invocations
114
- + contacts: gather all blame sources prior to invoking git-blame
115
- + contacts: validate hunk length earlier
116
- (this branch uses es/blame-L-more and es/blame-L-twice.)
71
+ Update post-receive-email script to make sure the message contents
72
+ and pathnames are encoded consistently in UTF-8.
73
118
- Originally merged to 'next' on 2013-08-14
74
75
+* js/xread-in-full (2013-08-20) 1 commit
76
+ (merged to 'next' on 2013-09-04 at 5bfb049)
77
+ + stream_to_pack: xread does not guarantee to read all requested bytes
78
121
-* fc/remote-hg-shared-setup (2013-08-11) 2 commits
122
- (merged to 'next' on 2013-08-28 at 41ee3fe)
123
- + remote-hg: add shared repo upgrade
124
- + remote-hg: ensure shared repo is initialized
79
+ Originally merged to 'next' on 2013-08-20
80
126
- Originally merged to 'next' on 2013-08-14
81
+ A call to xread() was used without a loop around to cope with short
82
+ read in the codepath to stream new contents to a pack.
83
84
129
-* fc/unpack-trees-leakfix (2013-08-13) 1 commit
130
- (merged to 'next' on 2013-08-28 at 3ad1f21)
131
- + unpack-trees: plug a memory leak
85
+* nd/push-no-thin (2013-08-13) 1 commit
86
+ (merged to 'next' on 2013-09-04 at faa8c02)
87
+ + push: respect --no-thin
88
89
Originally merged to 'next' on 2013-08-14
90
91
+ "git push --no-thin" was a no-op by mistake.
92
136
-* jc/check-x-z (2013-07-11) 4 commits
137
- (merged to 'next' on 2013-08-28 at a7670ce)
138
- + check-attr -z: a single -z should apply to both input and output
139
- + check-ignore -z: a single -z should apply to both input and output
140
- + check-attr: the name of the character is NUL, not NULL
141
- + check-ignore: the name of the character is NUL, not NULL
142
-
143
- Originally merged to 'next' on 2013-07-15
144
-
145
- "git check-ignore -z" applied the NUL termination to both its input
146
- (with --stdin) and its output, but "git check-attr -z" ignored the
147
- option on the output side.
93
149
- This is potentially a backward incompatible fix. Let's see if
150
- anybody screams before deciding if we want to do anything to help
151
- existing users (there may be none).
94
+* rt/rebase-p-no-merge-summary (2013-08-21) 1 commit
95
+ (merged to 'next' on 2013-09-04 at d8d89ee)
96
+ + rebase --preserve-merges: ignore "merge.log" config
97
98
+ Originally merged to 'next' on 2013-08-22
99
154
-* jc/diff-filter-negation (2013-07-19) 6 commits
155
- (merged to 'next' on 2013-08-28 at 5cc7720)
156
- + diff: deprecate -q option to diff-files
157
- + diff: allow lowercase letter to specify what change class to exclude
158
- + diff: reject unknown change class given to --diff-filter
159
- + diff: preparse --diff-filter string argument
160
- + diff: factor out match_filter()
161
- + diff: pass the whole diff_options to diffcore_apply_filter()
162
- (this branch is used by jc/hold-diff-remove-q-synonym-for-no-deletion.)
100
+ "git rebase -p" internally used the merge machinery, but when
101
+ rebasing, there should not be a need for merge summary.
102
164
- Originally merged to 'next' on 2013-07-22
103
166
- Teach "git diff --diff-filter" to express "I do not want to see
167
- these classes of changes" more directly by listing only the
168
- unwanted ones in lowercase (e.g. "--diff-filter=d" will show
169
- everything but deletion) and deprecate "diff-files -q" which did
170
- the same thing as "--diff-filter=d".
171
-
172
-
173
-* jc/parseopt-command-modes (2013-07-30) 2 commits
174
- (merged to 'next' on 2013-08-28 at 738b399)
175
- + tag: use OPT_CMDMODE
176
- + parse-options: add OPT_CMDMODE()
177
- (this branch is used by sb/parseopt-boolean-removal.)
178
-
179
- Many commands use --dashed-option as a operation mode selector
180
- (e.g. "git tag --delete") that the user can use at most one
181
- (e.g. "git tag --delete --verify" is a nonsense) and you cannot
182
- negate (e.g. "git tag --no-delete" is a nonsense). Make it easier
183
- for users of parse_options() to enforce these restrictions.
184
-
185
-
186
-* jc/push-cas (2013-08-02) 9 commits
187
- (merged to 'next' on 2013-08-28 at 784281f)
188
- + push: teach --force-with-lease to smart-http transport
189
- + send-pack: fix parsing of --force-with-lease option
190
- + t5540/5541: smart-http does not support "--force-with-lease"
191
- + t5533: test "push --force-with-lease"
192
- + push --force-with-lease: tie it all together
193
- + push --force-with-lease: implement logic to populate old_sha1_expect[]
194
- + remote.c: add command line option parser for "--force-with-lease"
195
- + builtin/push.c: use OPT_BOOL, not OPT_BOOLEAN
196
- + cache.h: move remote/connect API out of it
197
-
198
- Originally merged to 'next' on 2013-08-05
199
-
200
- Allow a safer "rewind of the remote tip" push than blind "--force",
201
- by requiring that the overwritten remote ref to be unchanged since
202
- the new history to replace it was prepared.
203
-
204
- The machinery is more or less ready. The "--force" option is again
205
- the big red button to override any safety, thanks to J6t's sanity
206
- (the original round allowed --lockref to defeat --force).
207
-
208
- The logic to choose the default implemented here is fragile
209
- (e.g. "git fetch" after seeing a failure will update the
210
- remote-tracking branch and will make the next "push" pass,
211
- defeating the safety pretty easily). It is suitable only for the
212
- simplest workflows, and it may hurt users more than it helps them.
213
-
214
-
215
-* jc/transport-do-not-use-connect-twice-in-fetch (2013-08-28) 6 commits
216
- (merged to 'next' on 2013-08-29 at f88a6da)
217
- + builtin/fetch.c: Fix a sparse warning
218
- (merged to 'next' on 2013-08-28 at 2ed86df)
219
- + fetch: work around "transport-take-over" hack
220
- + fetch: refactor code that fetches leftover tags
221
- + fetch: refactor code that prepares a transport
222
- + fetch: rename file-scope global "transport" to "gtransport"
223
- + t5802: add test for connect helper
104
+* sb/mailmap-freeing-NULL-is-ok (2013-08-20) 1 commit
105
+ (merged to 'next' on 2013-09-04 at c831015)
106
+ + mailmap: remove redundant check for freeing memory
107
108
Originally merged to 'next' on 2013-08-20
109
227
- The auto-tag-following code in "git fetch" tries to reuse the same
228
- transport twice when the serving end does not cooperate and does
229
- not give tags that point to commits that are asked for as part of
230
- the primary transfer. Unfortunately, Git-aware transport helper
231
- interface is not designed to be used more than once, hence this
232
- does not work over smart-http transfer.
233
-
234
-
235
-* jc/url-match (2013-08-09) 7 commits
236
- (merged to 'next' on 2013-08-28 at 2a9fd23)
237
- + builtin/config.c: compilation fix
238
- + config: "git config --get-urlmatch" parses section.<url>.key
239
- + builtin/config: refactor collect_config()
240
- + config: parse http.<url>.<variable> using urlmatch
241
- + config: add generic callback wrapper to parse section.<url>.key
242
- + config: add helper to normalize and match URLs
243
- + http.c: fix parsing of http.sslCertPasswordProtected variable
244
-
245
- Originally merged to 'next' on 2013-08-12
246
-
247
- Allow section.<urlpattern>.var configuration variables to be
248
- treated as a "virtual" section.var given a URL, and use the
249
- mechanism to enhance http.* configuration variables.
250
-
251
- This is a reroll of Kyle J. McKay's work.
252
-
110
254
-* jk/cat-file-batch-optim (2013-08-05) 1 commit
255
- (merged to 'next' on 2013-08-28 at 624e60d)
256
- + cat-file: only split on whitespace when %(rest) is used
257
-
258
- Originally merged to 'next' on 2013-08-06
259
-
260
- Rework the reverted change to `cat-file --batch-check`.
111
+* sh/pull-rebase-preserve (2013-09-04) 1 commit
112
+ (merged to 'next' on 2013-09-04 at 32a93bb)
113
+ + pull: allow pull to preserve merges when rebasing
114
115
+ Originally merged to 'next' on 2013-08-14
116
263
-* jk/fast-import-empty-ls (2013-06-23) 4 commits
264
- (merged to 'next' on 2013-08-28 at 876a39d)
265
- + fast-import: allow moving the root tree
266
- + fast-import: allow ls or filecopy of the root tree
267
- + fast-import: set valid mode on root tree in "ls"
268
- + t9300: document fast-import empty path issues
117
+ "git pull --rebase" always flattened the history; pull.rebase can
118
+ now be set to "preserve" to invoke "rebase --preserve-merges".
119
270
- Originally merged to 'next' on 2013-07-22
120
121
+* tf/gitweb-ss-tweak (2013-08-20) 4 commits
122
+ (merged to 'next' on 2013-09-04 at 774bfbe)
123
+ + gitweb: make search help link less ugly
124
+ + gitweb: omit the repository owner when it is unset
125
+ + gitweb: vertically centre contents of page footer
126
+ + gitweb: ensure OPML text fits inside its box
127
273
-* jk/mailmap-incomplete-line (2013-08-28) 1 commit
274
- (merged to 'next' on 2013-09-04 at e77e887)
275
- + mailmap: handle mailmap blobs without trailing newlines
128
+ Originally merged to 'next' on 2013-08-22
129
277
- Will merge later to 'maint'.
130
+ Tweak Gitweb CSS to layout some elements better.
131
132
+--------------------------------------------------
133
+[New Topics]
134
280
-* jl/some-submodule-config-are-not-boolean (2013-08-19) 1 commit
281
- (merged to 'next' on 2013-08-28 at 7fabc3e)
282
- + avoid segfault on submodule.*.path set to an empty "true"
135
+* bc/send-email-ssl-die-message-fix (2013-09-10) 1 commit
136
+ - send-email: don't call methods on undefined values
137
284
- Originally merged to 'next' on 2013-08-20
138
+ When send-email comes up with an error message to die with upon
139
+ failure to start an SSL session, it tried to read the error string
140
+ from a wrong place.
141
142
+ Will merge to 'next'.
143
287
-* jl/submodule-mv (2013-08-06) 5 commits
288
- (merged to 'next' on 2013-08-28 at 4ec6b41)
289
- + rm: delete .gitmodules entry of submodules removed from the work tree
290
- + mv: update the path entry in .gitmodules for moved submodules
291
- + submodule.c: add .gitmodules staging helper functions
292
- + mv: move submodules using a gitfile
293
- + mv: move submodules together with their work trees
294
- (this branch is tangled with nd/magic-pathspec.)
144
296
- Originally merged to 'next' on 2013-08-08
145
+* jc/checkout-detach-doc (2013-09-11) 1 commit
146
+ - checkout: update synopsys and documentation on detaching HEAD
147
298
- "git mv A B" when moving a submodule A does "the right thing",
299
- inclusing relocating its working tree and adjusting the paths in
300
- the .gitmodules file.
148
+ "git checkout [--detach] <commit>" was listed poorly in the
149
+ synopsis section of its documentation.
150
151
303
-* km/svn-1.8-serf-only (2013-07-18) 3 commits
304
- (merged to 'next' on 2013-08-28 at 1119134)
305
- + Git.pm: revert _temp_cache use of temp_is_locked
306
- + git-svn: allow git-svn fetching to work using serf
307
- + Git.pm: add new temp_is_locked function
152
+* jc/cvsserver-perm-bit-fix (2013-09-11) 1 commit
153
+ - cvsserver: pick up the right mode bits
154
309
- Originally merged to 'next' on 2013-07-19
155
+ "git cvsserver" computed the permission mode bits incorrectly for
156
+ executable files.
157
311
- Subversion 1.8.0 that was recently released breaks older subversion
312
- clients coming over http/https in various ways.
158
+ Will merge to 'next'.
159
160
315
-* mm/no-shell-escape-in-die-message (2013-08-07) 1 commit
316
- (merged to 'next' on 2013-08-28 at 86b300f)
317
- + die_with_status: use "printf '%s\n'", not "echo"
161
+* jk/trailing-slash-in-pathspec (2013-09-10) 2 commits
162
+ - rm: re-use parse_pathspec's trailing-slash removal
163
+ - reset: handle submodule with trailing slash
164
319
- Originally merged to 'next' on 2013-08-08
165
+ Needs a reroll?
166
321
- Fixes a minor bug in "git rebase -i" (there could be others, as the
322
- root cause is pretty generic) where the code feeds a random, data
323
- dependeant string to 'echo' and expects it to come out literally.
167
168
+* kb/msvc-compile (2013-09-11) 5 commits
169
+ - Windows: do not redefine _WIN32_WINNT
170
+ - MinGW: Fix stat definitions to work with MinGW runtime version 4.0
171
+ - MSVC: fix stat definition hell
172
+ - MSVC: fix compile errors due to macro redefinitions
173
+ - MSVC: fix compile errors due to missing libintl.h
174
326
-* ms/fetch-prune-configuration (2013-07-18) 1 commit
327
- (merged to 'next' on 2013-08-28 at fa6ffc7)
328
- + fetch: make --prune configurable
175
+ Build updates for Windows port.
176
330
- Originally merged to 'next' on 2013-07-21
177
332
- Allow fetch.prune and remote.*.prune configuration variables to be set,
333
- and "git fetch" to behave as if "--prune" is given.
178
+* lc/filter-branch-too-many-refs (2013-09-11) 2 commits
179
+ - ### DONOTMERGE - missing sign-off
180
+ - Allow git-filter-branch to process large repositories with lots of branches.
181
335
- "git fetch" that honors remote.*.prune is fine, but I wonder if we
336
- should somehow make "git push" aware of it as well. Perhaps
337
- remote.*.prune should not be just a boolean, but a 4-way "none",
338
- "push", "fetch", "both"?
182
+ "git filter-branch" in a repository with many refs blew limit of
183
+ command line length.
184
185
+ Needs a sign-off.
186
341
-* nd/clone-connectivity-shortcut (2013-07-23) 1 commit
342
- (merged to 'next' on 2013-08-28 at d227f9f)
343
- + smart http: use the same connectivity check on cloning
187
345
- Originally merged to 'next' on 2013-07-30
188
+* mm/commit-template-squelch-advice-messages (2013-09-11) 2 commits
189
+ - commit: disable status hints when writing to COMMIT_EDITMSG
190
+ - wt-status: turn advice_status_hints into a field of wt_status
191
192
+ From the commit log template, remove irrelevant "advice" messages
193
+ that are shared with "git status" output.
194
348
-* nd/gc-lock-against-each-other (2013-08-09) 1 commit
349
- (merged to 'next' on 2013-08-28 at 46e072b)
350
- + gc: reject if another gc is running, unless --force is given
195
+ Will merge to 'next'.
196
352
- Originally merged to 'next' on 2013-08-14
197
198
+* np/lookup-object-hashing (2013-09-11) 1 commit
199
+ - lookup_object: remove hashtable_index() and optimize hash_obj()
200
355
-* nd/magic-pathspec (2013-09-05) 50 commits
356
- (merged to 'next' on 2013-09-05 at b832b8d)
357
- + add: lift the pathspec magic restriction on "add -p"
358
- + pathspec: catch prepending :(prefix) on pathspec with short magic
359
- (merged to 'next' on 2013-08-28 at 305c6e9)
360
- + rm: do not set a variable twice without intermediate reading.
361
- + t6131 - skip tests if on case-insensitive file system
362
- + parse_pathspec: accept :(icase)path syntax
363
- + pathspec: support :(glob) syntax
364
- + pathspec: make --literal-pathspecs disable pathspec magic
365
- + pathspec: support :(literal) syntax for noglob pathspec
366
- + kill limit_pathspec_to_literal() as it's only used by parse_pathspec()
367
- + parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN
368
- + parse_pathspec: make sure the prefix part is wildcard-free
369
- + rename field "raw" to "_raw" in struct pathspec
370
- + tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
371
- + remove match_pathspec() in favor of match_pathspec_depth()
372
- + remove init_pathspec() in favor of parse_pathspec()
373
- + remove diff_tree_{setup,release}_paths
374
- + convert common_prefix() to use struct pathspec
375
- + convert add_files_to_cache to take struct pathspec
376
- + convert {read,fill}_directory to take struct pathspec
377
- + convert refresh_index to take struct pathspec
378
- + convert report_path_error to take struct pathspec
379
- + checkout: convert read_tree_some to take struct pathspec
380
- + convert unmerge_cache to take struct pathspec
381
- + convert run_add_interactive to use struct pathspec
382
- + convert read_cache_preload() to take struct pathspec
383
- + line-log: convert to use parse_pathspec
384
- + reset: convert to use parse_pathspec
385
- + add: convert to use parse_pathspec
386
- + check-ignore: convert to use parse_pathspec
387
- + archive: convert to use parse_pathspec
388
- + ls-files: convert to use parse_pathspec
389
- + rm: convert to use parse_pathspec
390
- + checkout: convert to use parse_pathspec
391
- + rerere: convert to use parse_pathspec
392
- + status: convert to use parse_pathspec
393
- + commit: convert to use parse_pathspec
394
- + clean: convert to use parse_pathspec
395
- + guard against new pathspec magic in pathspec matching code
396
- + parse_pathspec: support prefixing original patterns
397
- + parse_pathspec: support stripping/checking submodule paths
398
- + parse_pathspec: support stripping submodule trailing slashes
399
- + parse_pathspec: add special flag for max_depth feature
400
- + convert some get_pathspec() calls to parse_pathspec()
401
- + parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL} flags
402
- + parse_pathspec: save original pathspec for reporting
403
- + add parse_pathspec() that converts cmdline args to struct pathspec
404
- + pathspec: add copy_pathspec
405
- + pathspec: i18n-ize error strings in pathspec parsing code
406
- + move struct pathspec and related functions to pathspec.[ch]
407
- + clean: remove unused variable "seen"
408
- (this branch is tangled with jl/submodule-mv.)
409
-
410
- Originally merged to 'next' on 2013-07-23
411
-
412
- Use "struct pathspec" interface in more places, instead of array of
413
- characters, the latter of which cannot express magic pathspecs
414
- (e.g. ":(icase)makefile" that matches both Makefile and makefile).
415
-
416
-
417
-* nd/sq-quote-buf (2013-07-30) 3 commits
418
- (merged to 'next' on 2013-08-28 at d0ffd55)
419
- + quote: remove sq_quote_print()
420
- + tar-tree: remove dependency on sq_quote_print()
421
- + for-each-ref, quote: convert *_quote_print -> *_quote_buf
422
-
423
- Originally merged to 'next' on 2013-08-01
424
-
425
- Code simplification as a preparatory step to something larger.
426
-
427
-
428
-* rr/feed-real-path-to-editor (2013-07-29) 1 commit
429
- (merged to 'next' on 2013-08-28 at 7458fa4)
430
- + editor: use canonicalized absolute path
431
-
432
- Originally merged to 'next' on 2013-07-30
433
-
434
-
435
-* sb/diff-delta-remove-needless-comparison (2013-08-18) 1 commit
436
- (merged to 'next' on 2013-08-28 at ba09c3f)
437
- + create_delta_index: simplify condition always evaluating to true
201
+ Micro optimize hash function used in the object hash table.
202
439
- Originally merged to 'next' on 2013-08-20
203
+ Will merge to 'next'.
204
205
+--------------------------------------------------
206
+[Stalled]
207
442
-* sb/misc-cleanup (2013-08-09) 3 commits
443
- (merged to 'next' on 2013-08-28 at bc2045b)
444
- + rm: remove unneeded null pointer check
445
- + diff: fix a possible null pointer dereference
446
- + diff: remove ternary operator evaluating always to true
208
+* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
209
+ - git-send-email: Cache generated message-ids, use them when prompting
210
+ - git-send-email: add optional 'choices' parameter to the ask sub
211
448
- Originally merged to 'next' on 2013-08-14
212
213
+* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
214
+ - ### DONTMERGE: needs better explanation on what config they need
215
+ - pack-refs.c: Add missing call to git_config()
216
+ - show-ref.c: Add missing call to git_config()
217
451
-* sb/parseopt-boolean-removal (2013-08-07) 9 commits
452
- (merged to 'next' on 2013-08-28 at 2f3f21f)
453
- + revert: use the OPT_CMDMODE for parsing, reducing code
454
- + checkout-index: fix negations of even numbers of -n
455
- + config parsing options: allow one flag multiple times
456
- + hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP
457
- + branch, commit, name-rev: ease up boolean conditions
458
- + checkout: remove superfluous local variable
459
- + log, format-patch: parsing uses OPT__QUIET
460
- + Replace deprecated OPT_BOOLEAN by OPT_BOOL
461
- + Remove deprecated OPTION_BOOLEAN for parsing arguments
462
- (this branch uses jc/parseopt-command-modes.)
218
+ The changes themselves are probably good, but it is unclear what
219
+ basic setting needs to be read for which exact operation.
220
464
- Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use
465
- OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn
466
- remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary.
221
+ Waiting for clarification.
222
+ $gmane/228294
223
224
469
-* sg/bash-prompt-lf-in-cwd-test (2013-08-18) 1 commit
470
- (merged to 'next' on 2013-08-28 at eb449b5)
471
- + bash prompt: test the prompt with newline in repository path
225
+* jh/shorten-refname (2013-05-07) 4 commits
226
+ - t1514: refname shortening is done after dereferencing symbolic refs
227
+ - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
228
+ - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
229
+ - t1514: Add tests of shortening refnames in strict/loose mode
230
473
- Originally merged to 'next' on 2013-08-20
231
+ When remotes/origin/HEAD is not a symbolic ref, "rev-parse
232
+ --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
233
+ "origin/HEAD", which is fixed with this series (if it is a symbolic
234
+ ref that points at remotes/origin/something, then it should show
235
+ "origin/something" and it already does).
236
237
+ Expecting a reroll, as an early part of a larger series.
238
+ $gmane/225137
239
476
-* sp/clip-read-write-to-8mb (2013-08-20) 2 commits
477
- (merged to 'next' on 2013-08-28 at c9840d7)
478
- + Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"
479
- + xread, xwrite: limit size of IO to 8MB
240
481
- Originally merged to 'next' on 2013-08-22
241
+* mg/more-textconv (2013-05-10) 7 commits
242
+ - grep: honor --textconv for the case rev:path
243
+ - grep: allow to use textconv filters
244
+ - t7008: demonstrate behavior of grep with textconv
245
+ - cat-file: do not die on --textconv without textconv filters
246
+ - show: honor --textconv for blobs
247
+ - diff_opt: track whether flags have been set explicitly
248
+ - t4030: demonstrate behavior of show with textconv
249
483
- Send a large request to read(2)/write(2) as a smaller but still
484
- reasonably large chunks, which would improve the latency when the
485
- operation needs to be killed and incidentally works around broken
486
- 64-bit systems that cannot take a 2GB write or read in one go.
250
+ Make "git grep" and "git show" pay attention to --textconv when
251
+ dealing with blob objects.
252
253
+ I thought this was pretty well designed and executed, but it seems
254
+ there are some doubts on the list; kicked back to 'pu'.
255
489
-* tg/index-struct-sizes (2013-08-20) 1 commit
490
- (merged to 'next' on 2013-08-28 at c815042)
491
- + read-cache: use fixed width integer types
256
493
- Originally merged to 'next' on 2013-08-22
257
+* jc/format-patch (2013-04-22) 2 commits
258
+ - format-patch: --inline-single
259
+ - format-patch: rename "no_inline" field
260
495
- The code that reads from a region that mmaps an on-disk index
496
- assumed that "int"/"short" are always 32/16 bits.
261
+ A new option to send a single patch to the standard output to be
262
+ appended at the bottom of a message. I personally have no need for
263
+ this, but it was easy enough to cobble together. Tests, docs and
264
+ stripping out more MIMEy stuff are left as exercises to interested
265
+ parties.
266
267
+ Not ready for inclusion.
268
499
-* tr/fd-gotcha-fixes (2013-08-06) 1 commit
500
- (merged to 'next' on 2013-08-28 at 5305271)
501
- + t0070: test that git_mkstemps correctly checks return value of open()
269
+ Will discard unless we hear from anybody who is interested in
270
+ tying its loose ends.
271
503
- Originally merged to 'next' on 2013-08-08
272
505
- Finishing touches to an earlier fix already in 'master'.
273
+* jk/gitweb-utf8 (2013-04-08) 4 commits
274
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
275
+ - gitweb: Don't append ';js=(0|1)' to external links
276
+ - gitweb: Make feed title valid utf8
277
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
278
279
+ Various fixes to gitweb.
280
508
-* tr/log-full-diff-keep-true-parents (2013-08-05) 2 commits
509
- (merged to 'next' on 2013-08-28 at e86ec11)
510
- + log: use true parents for diff when walking reflogs
511
- + log: use true parents for diff even when rewriting
281
+ Drew Northup volunteered to take a look into this.
282
+ $gmane/226216
283
513
- Originally merged to 'next' on 2013-08-08
284
515
- Output from "git log --full-diff -- <pathspec>" looked strange,
516
- because comparison was done with the previous ancestor that touched
517
- the specified <pathspec>, causing the patches for paths outside the
518
- pathspec to show more than the single commit has changed.
285
+* jc/show-branch (2013-06-07) 5 commits
286
+ - show-branch: use commit slab to represent bitflags of arbitrary width
287
+ - show-branch.c: remove "all_mask"
288
+ - show-branch.c: abstract out "flags" operation
289
+ - show-branch.c: lift all_mask/all_revs to a global static
290
+ - show-branch.c: update comment style
291
520
- Tweak "git reflog -p" for the same reason using the same mechanism.
292
+ Waiting for the final step to lift the hard-limit before sending it out.
293
294
--------------------------------------------------
523
-[New Topics]
295
+[Cooking]
296
297
* js/add-i-mingw (2013-09-04) 1 commit
526
- - add--interactive: fix external command invocation on Windows
298
+ (merged to 'next' on 2013-09-10 at 50ab841)
299
+ + add--interactive: fix external command invocation on Windows
300
301
The implementation of "add -i" has a crippling code to work around
302
ActiveState Perl limitation but it by mistake also triggered on Git
303
for Windows where MSYS perl is used.
304
532
- Will merge to 'next'.
305
+ Will merge to 'master' in the third batch.
306
307
308
* rh/ishes-doc (2013-09-04) 7 commits
536
- - glossary: fix and clarify the definition of 'ref'
537
- - revisions.txt: fix and clarify <rev>^{<type>}
538
- - glossary: more precise definition of tree-ish (a.k.a. treeish)
539
- - use 'commit-ish' instead of 'committish'
540
- - use 'tree-ish' instead of 'treeish'
541
- - glossary: define commit-ish (a.k.a. committish)
542
- - glossary: mention 'treeish' as an alternative to 'tree-ish'
309
+ (merged to 'next' on 2013-09-10 at 3611e8a)
310
+ + glossary: fix and clarify the definition of 'ref'
311
+ + revisions.txt: fix and clarify <rev>^{<type>}
312
+ + glossary: more precise definition of tree-ish (a.k.a. treeish)
313
+ + use 'commit-ish' instead of 'committish'
314
+ + use 'tree-ish' instead of 'treeish'
315
+ + glossary: define commit-ish (a.k.a. committish)
316
+ + glossary: mention 'treeish' as an alternative to 'tree-ish'
317
318
We liberally use "committish" and "commit-ish" (and "treeish" and
319
"tree-ish"); as these are non-words, let's unify these terms to
320
their dashed form. More importantly, clarify the documentation on
321
object peeling using these terms.
322
549
- Will merge to 'next'.
323
+ Will merge to 'master' in the third batch.
324
325
326
* jc/commit-is-spelled-with-two-ems (2013-09-05) 2 commits
@@ -554,7 +328,7 @@ of the repositories listed at
328
+ typofix: cherry is spelled with two ars
329
+ typofix: commit is spelled with two ems
330
557
- Will merge to 'master'.
331
+ Will merge to 'master' in the third batch.
332
333
334
* bc/http-backend-allow-405 (2013-09-09) 1 commit
@@ -605,12 +379,13 @@ of the repositories listed at
379
380
381
* jk/remove-remote-helpers-in-python (2013-09-09) 1 commit
608
- - git_remote_helpers: remove little used Python library
382
+ (merged to 'next' on 2013-09-10 at 49c7a74)
383
+ + git_remote_helpers: remove little used Python library
384
385
Remove now disused remote-helpers framework for helpers written in
386
Python.
387
613
- Will merge to 'next'.
388
+ Will merge to 'master' in the third batch.
389
390
391
* jk/upload-pack-keepalive (2013-09-09) 2 commits
@@ -636,13 +411,14 @@ of the repositories listed at
411
412
413
* ss/doclinks (2013-09-06) 1 commit
639
- - Documentation: make AsciiDoc links always point to HTML files
414
+ (merged to 'next' on 2013-09-10 at 2d029a9)
415
+ + Documentation: make AsciiDoc links always point to HTML files
416
417
When we converted many documents that were traditionally text-only
418
to be formatted to AsciiDoc, we did not update links that point at
419
them to refer to the formatted HTML files.
420
645
- Will merge to 'next'.
421
+ Will merge to 'master' in the third batch.
422
423
424
* uh/git-svn-serf-fix (2013-09-06) 1 commit
@@ -652,97 +428,6 @@ of the repositories listed at
428
dumped core due to a bug in the serf library that SVN uses. Work
429
it around on our side, even though the SVN side is being fixed.
430
655
---------------------------------------------------
656
-[Stalled]
657
-
658
-* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
659
- - git-send-email: Cache generated message-ids, use them when prompting
660
- - git-send-email: add optional 'choices' parameter to the ask sub
661
-
662
-
663
-* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
664
- - ### DONTMERGE: needs better explanation on what config they need
665
- - pack-refs.c: Add missing call to git_config()
666
- - show-ref.c: Add missing call to git_config()
667
-
668
- The changes themselves are probably good, but it is unclear what
669
- basic setting needs to be read for which exact operation.
670
-
671
- Waiting for clarification.
672
- $gmane/228294
673
-
674
-
675
-* jh/shorten-refname (2013-05-07) 4 commits
676
- - t1514: refname shortening is done after dereferencing symbolic refs
677
- - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
678
- - t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD"
679
- - t1514: Add tests of shortening refnames in strict/loose mode
680
-
681
- When remotes/origin/HEAD is not a symbolic ref, "rev-parse
682
- --abbrev-ref remotes/origin/HEAD" ought to show "origin", not
683
- "origin/HEAD", which is fixed with this series (if it is a symbolic
684
- ref that points at remotes/origin/something, then it should show
685
- "origin/something" and it already does).
686
-
687
- Expecting a reroll, as an early part of a larger series.
688
- $gmane/225137
689
-
690
-
691
-* mg/more-textconv (2013-05-10) 7 commits
692
- - grep: honor --textconv for the case rev:path
693
- - grep: allow to use textconv filters
694
- - t7008: demonstrate behavior of grep with textconv
695
- - cat-file: do not die on --textconv without textconv filters
696
- - show: honor --textconv for blobs
697
- - diff_opt: track whether flags have been set explicitly
698
- - t4030: demonstrate behavior of show with textconv
699
-
700
- Make "git grep" and "git show" pay attention to --textconv when
701
- dealing with blob objects.
702
-
703
- I thought this was pretty well designed and executed, but it seems
704
- there are some doubts on the list; kicked back to 'pu'.
705
-
706
-
707
-* jc/format-patch (2013-04-22) 2 commits
708
- - format-patch: --inline-single
709
- - format-patch: rename "no_inline" field
710
-
711
- A new option to send a single patch to the standard output to be
712
- appended at the bottom of a message. I personally have no need for
713
- this, but it was easy enough to cobble together. Tests, docs and
714
- stripping out more MIMEy stuff are left as exercises to interested
715
- parties.
716
-
717
- Not ready for inclusion.
718
-
719
- Will discard unless we hear from anybody who is interested in
720
- tying its loose ends.
721
-
722
-
723
-* jk/gitweb-utf8 (2013-04-08) 4 commits
724
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
725
- - gitweb: Don't append ';js=(0|1)' to external links
726
- - gitweb: Make feed title valid utf8
727
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
728
-
729
- Various fixes to gitweb.
730
-
731
- Drew Northup volunteered to take a look into this.
732
- $gmane/226216
733
-
734
-
735
-* jc/show-branch (2013-06-07) 5 commits
736
- - show-branch: use commit slab to represent bitflags of arbitrary width
737
- - show-branch.c: remove "all_mask"
738
- - show-branch.c: abstract out "flags" operation
739
- - show-branch.c: lift all_mask/all_revs to a global static
740
- - show-branch.c: update comment style
741
-
742
- Waiting for the final step to lift the hard-limit before sending it out.
743
-
744
---------------------------------------------------
745
-[Cooking]
431
432
* fc/contrib-bzr-hg-fixes (2013-09-03) 10 commits
433
- contrib/remote-helpers: quote variable references in redirection targets
@@ -766,43 +451,26 @@ of the repositories listed at
451
It was unclear in the documentation how various configurations and
452
environment variables determine which pager is eventually used.
453
769
- Will merge to 'master'.
770
-
771
-
772
-* np/pack-v4 (2013-09-03) 24 commits
773
- - Document pack v4 format
774
- - initial pack index v3 support on the read side
775
- - pack v4: add progress display
776
- - pack v4: normalize pack name to properly generate the pack index file name
777
- - pack index v3
778
- - pack v4: relax commit parsing a bit
779
- - pack v4: honor pack.compression config option
780
- - pack v4: load delta candidate for encoding tree objects
781
- - pack v4: tree object delta encoding
782
- - pack v4: object writing
783
- - pack v4: object data copy
784
- - pack v4: object headers
785
- - pack v4: creation code
786
- - pack v4: dictionary table output
787
- - pack v4: tree object encoding
788
- - pack v4: commit object encoding
789
- - pack v4: basic references encoding
790
- - pack v4: move to struct pack_idx_entry and get rid of our own struct idx_entry
791
- - pack v4: split the object list and dictionary creation
792
- - pack v4: add commit object parsing
793
- - pack v4: add tree entry mode support to dictionary entries
794
- - pack v4: scan tree objects
795
- - export packed_object_info()
796
- - pack v4: initial pack dictionary structure and code
797
-
798
- Will replace with a newer version of the series.
454
+ Will merge to 'master' in the third batch.
455
+
456
+
457
+* np/pack-v4 (2013-09-11) 88 commits
458
+ - t1050: replace one instance of show-index with verify-pack
459
+ - index-pack, pack-objects: allow creating .idx v2 with .pack v4
460
+ - unpack-objects: decode v4 trees
461
+ - unpack-objects: allow to save processed bytes to a buffer
462
+ - unpack-objects: decode v4 commits
463
+ - ...
464
+
465
+ Nico and Duy advancing the eternal vaporware pack-v4. This is here
466
+ primarily for wider distribution of the preview edition.
467
468
469
* jk/free-tree-buffer (2013-06-06) 1 commit
470
(merged to 'next' on 2013-09-09 at 3576189)
471
+ clear parsed flag when we free tree buffers
472
805
- Will merge to 'master'.
473
+ Will merge to 'master' in the third batch.
474
475
476
* jk/has-sha1-file-retry-packed (2013-08-30) 1 commit
@@ -814,17 +482,17 @@ of the repositories listed at
482
prevent racing with a concurrent repacker; teach the same logic to
483
has_sha1_file().
484
817
- Will merge to 'master'.
485
+ Will merge to 'master' in the third batch.
486
487
488
* ab/gitweb-author-initials (2013-08-30) 1 commit
489
(merged to 'next' on 2013-09-09 at ecb924d)
490
+ gitweb: Fix the author initials in blame for non-ASCII names
491
824
- Will merge to 'master'.
492
+ Will merge to 'master' in the fourth batch.
493
494
827
-* bk/refs-multi-update (2013-09-09) 8 commits
495
+* bk/refs-multi-update (2013-09-11) 8 commits
496
- update-ref: add test cases covering --stdin signature
497
- update-ref: support multiple simultaneous updates
498
- refs: add update_refs for multiple simultaneous updates
@@ -837,7 +505,9 @@ of the repositories listed at
505
Give "update-refs" a "--stdin" option to read multiple update
506
requests and perform them in an all-or-none fashion.
507
840
- Comments?
508
+ Looking good.
509
+
510
+ Will merge to 'next'.
511
512
513
* fc/at-head (2013-09-09) 3 commits
@@ -860,7 +530,7 @@ of the repositories listed at
530
531
Code simpification.
532
863
- Will merge to 'master'.
533
+ Will merge to 'master' in the third batch.
534
535
536
* fc/rev-parse-test-updates (2013-09-03) 4 commits
@@ -872,7 +542,7 @@ of the repositories listed at
542
543
Modernize tests.
544
875
- Will merge to 'master'.
545
+ Will merge to 'master' in the third batch.
546
547
548
* fc/t3200-fixes (2013-09-03) 3 commits
@@ -881,7 +551,7 @@ of the repositories listed at
551
+ t: branch: fix typo
552
+ t: branch: trivial style fix
553
884
- Will merge to 'master'.
554
+ Will merge to 'master' in the third batch.
555
556
557
* fc/trivial (2013-09-08) 5 commits
@@ -892,7 +562,7 @@ of the repositories listed at
562
+ branch: trivial style fix
563
+ reset: trivial refactoring
564
895
- Will merge to 'master'.
565
+ Will merge to 'master' in the third batch.
566
567
568
* jc/ref-excludes (2013-09-03) 2 commits
@@ -915,7 +585,7 @@ of the repositories listed at
585
should apply the same "no subprocess or pipe" optimization as we
586
apply to user-supplied GIT_PAGER=cat.
587
918
- Will merge to 'master'.
588
+ Will merge to 'master' in the fourth batch.
589
590
591
* nd/git-dir-pointing-at-gitfile (2013-09-03) 1 commit
@@ -925,7 +595,7 @@ of the repositories listed at
595
We made sure that we notice the user-supplied GIT_DIR is actually a
596
gitfile, but failed to do so when the default ".git" is a gitfile.
597
928
- Will merge to 'master'.
598
+ Will merge to 'master' in the fourth batch.
599
600
601
* nr/git-cd-to-a-directory (2013-09-09) 1 commit
@@ -973,7 +643,7 @@ of the repositories listed at
643
Finishing touches to update the document to adjust to a new option
644
"git clean" learned recently.
645
976
- Will merge to 'master'.
646
+ Will merge to 'master' in the fourth batch.
647
648
649
* mm/status-without-comment-char (2013-09-06) 6 commits
@@ -995,34 +665,16 @@ of the repositories listed at
665
Will merge to 'next'.
666
667
998
-* js/xread-in-full (2013-08-20) 1 commit
999
- (merged to 'next' on 2013-09-04 at 5bfb049)
1000
- + stream_to_pack: xread does not guarantee to read all requested bytes
1001
-
1002
- Originally merged to 'next' on 2013-08-20
1003
-
1004
- A call to xread() was used without a loop around to cope with short
1005
- read in the codepath to stream new contents to a pack.
1006
-
1007
- Will merge to 'master' in the third batch.
1008
-
1009
-
1010
-* sb/mailmap-freeing-NULL-is-ok (2013-08-20) 1 commit
1011
- (merged to 'next' on 2013-09-04 at c831015)
1012
- + mailmap: remove redundant check for freeing memory
1013
-
1014
- Originally merged to 'next' on 2013-08-20
1015
-
1016
- Will merge to 'master' in the third batch.
1017
-
1018
-
1019
-* bc/submodule-status-ignored (2013-09-04) 2 commits
1020
- - submodule: don't print status output with ignore=all
1021
- - submodule: fix confusing variable name
668
+* bc/submodule-status-ignored (2013-09-11) 3 commits
669
+ (merged to 'next' on 2013-09-11 at 9f66712)
670
+ + Improve documentation concerning the status.submodulesummary setting
671
+ (merged to 'next' on 2013-09-10 at a417960)
672
+ + submodule: don't print status output with ignore=all
673
+ + submodule: fix confusing variable name
674
675
Originally merged to 'next' on 2013-08-22
676
1025
- Will merge to 'next'.
677
+ Will cook in 'next' a bit.
678
679
680
* jk/config-int-range-check (2013-09-09) 5 commits
@@ -1039,7 +691,7 @@ of the repositories listed at
691
number does not fit in "int" (on 32-bit platforms anyway) but it
692
did not.
693
1042
- Will merge to 'master'.
694
+ Will merge to 'master' in the third batch.
695
696
697
* jk/duplicate-objects-in-packs (2013-09-04) 5 commits
@@ -1053,7 +705,7 @@ of the repositories listed at
705
A packfile that stores the same object more than once is broken and
706
will be rejected.
707
1056
- Will merge to 'master'.
708
+ Will merge to 'master' in the fourth batch.
709
710
711
* mm/mediawiki-dumb-push-fix (2013-09-03) 4 commits
@@ -1063,24 +715,13 @@ of the repositories listed at
715
+ transport-helper: add no-private-update capability
716
+ git-remote-mediawiki: add test and check Makefile targets
717
1066
- Will merge to 'master'.
1067
-
1068
-
1069
-* rt/rebase-p-no-merge-summary (2013-08-21) 1 commit
1070
- (merged to 'next' on 2013-09-04 at d8d89ee)
1071
- + rebase --preserve-merges: ignore "merge.log" config
1072
-
1073
- Originally merged to 'next' on 2013-08-22
1074
-
1075
- "git rebase -p" internally used the merge machinery, but when
1076
- rebasing, there should not be a need for merge summary.
1077
-
718
Will merge to 'master' in the third batch.
719
720
721
* dw/diff-no-index-doc (2013-08-28) 2 commits
1082
- - diff --no-index: describe in a separate paragraph
1083
- - diff --no-index: clarify operation when not inside a repository
722
+ (merged to 'next' on 2013-09-10 at 423c8f6)
723
+ + diff --no-index: describe in a separate paragraph
724
+ + diff --no-index: clarify operation when not inside a repository
725
726
When the user types "git diff" outside a working tree, thinking he
727
is inside one, the current error message that is a single-liner
@@ -1089,7 +730,7 @@ of the repositories listed at
730
error message when we fell into the "--no-index" mode without an
731
explicit command line option to instruct us to do so.
732
1092
- Will merge to 'next'.
733
+ Will merge to 'master' in the third batch.
734
735
736
* sb/repack-in-c (2013-08-30) 2 commits
@@ -1108,7 +749,7 @@ of the repositories listed at
749
from existing history, but did not consult mailmap to grab the
750
preferred author name.
751
1111
- Will merge to 'master'.
752
+ Will merge to 'master' in the fourth batch.
753
754
755
* jk/write-broken-index-with-nul-sha1 (2013-08-28) 1 commit
@@ -1120,7 +761,7 @@ of the repositories listed at
761
allow so to be able to use tools like filter-branch to correct such
762
broken tree objects.
763
1123
- Will merge to 'master'.
764
+ Will merge to 'master' in the fourth batch.
765
766
767
* kk/tests-with-no-perl (2013-08-24) 4 commits
@@ -1132,46 +773,47 @@ of the repositories listed at
773
774
Some tests were not skipped under NO_PERL build.
775
1135
- Will merge to 'master'.
776
+ Will merge to 'master' in the third batch.
777
778
779
* mm/fast-import-feature-doc (2013-08-25) 1 commit
780
(merged to 'next' on 2013-09-05 at 83802e2)
781
+ Documentation/fast-import: clarify summary for `feature` command
782
1142
- Will merge to 'master'.
783
+ Will merge to 'master' in the third batch.
784
785
786
* mm/remote-helpers-doc (2013-08-26) 1 commit
787
(merged to 'next' on 2013-09-05 at c181b35)
788
+ Documentation/remote-helpers: document common use-case for private ref
789
1149
- Will merge to 'master'.
790
+ Will merge to 'master' in the third batch.
791
792
793
* mn/doc-pack-heu-remove-dead-pastebin (2013-08-23) 1 commit
794
(merged to 'next' on 2013-09-05 at 5caecec)
795
+ remove dead pastebin link from pack-heuristics document
796
1156
- Will merge to 'master'.
797
+ Will merge to 'master' in the third batch.
798
799
800
* ta/user-manual (2013-08-27) 11 commits
1160
- - "git prune" is safe
1161
- - Remove irrelevant reference from "Tying it all together"
1162
- - Remove unnecessary historical note from "Object storage format"
1163
- - Improve section "Merging multiple trees"
1164
- - Improve section "Manipulating branches"
1165
- - Simplify "How to make a commit"
1166
- - Fix some typos and improve wording
1167
- - Use "git merge" instead of "git pull ."
1168
- - Use current output for "git repack"
1169
- - Use current "detached HEAD" message
1170
- - Call it "Git User Manual" and remove reference to very old Git version
801
+ (merged to 'next' on 2013-09-10 at 1361be1)
802
+ + "git prune" is safe
803
+ + Remove irrelevant reference from "Tying it all together"
804
+ + Remove unnecessary historical note from "Object storage format"
805
+ + Improve section "Merging multiple trees"
806
+ + Improve section "Manipulating branches"
807
+ + Simplify "How to make a commit"
808
+ + Fix some typos and improve wording
809
+ + Use "git merge" instead of "git pull ."
810
+ + Use current output for "git repack"
811
+ + Use current "detached HEAD" message
812
+ + Call it "Git User Manual" and remove reference to very old Git version
813
814
Update the user's manual to more recent versions of Git.
815
1174
- Will merge to 'next'.
816
+ Will merge to 'master' in the third batch.
817
818
819
* tb/precompose-autodetect-fix (2013-08-27) 1 commit
@@ -1182,32 +824,6 @@ of the repositories listed at
824
unicode strings" workaround, but did not automatically enable it.
825
Now we do.
826
1185
- Will merge to 'master'.
1186
-
1187
-
1188
-* tf/gitweb-ss-tweak (2013-08-20) 4 commits
1189
- (merged to 'next' on 2013-09-04 at 774bfbe)
1190
- + gitweb: make search help link less ugly
1191
- + gitweb: omit the repository owner when it is unset
1192
- + gitweb: vertically centre contents of page footer
1193
- + gitweb: ensure OPML text fits inside its box
1194
-
1195
- Originally merged to 'next' on 2013-08-22
1196
-
1197
- Tweak Gitweb CSS to layout some elements better.
1198
-
1199
- Will merge to 'master' in the third batch.
1200
-
1201
-
1202
-* es/rebase-i-respect-core-commentchar (2013-08-18) 1 commit
1203
- (merged to 'next' on 2013-09-04 at 8c1ce68)
1204
- + rebase -i: fix cases ignoring core.commentchar
1205
-
1206
- Originally merged to 'next' on 2013-08-20
1207
-
1208
- "rebase -i" forgot that the comment character can be configurable
1209
- while reading its insn sheet.
1210
-
827
Will merge to 'master' in the third batch.
828
829
@@ -1237,85 +853,16 @@ of the repositories listed at
853
during a fetch into a shallow repository, we unnecessarily sent
854
objects the sending side knows the receiving end has.
855
1240
- Will merge to 'master'.
1241
-
1242
-
1243
-* jc/ls-files-killed-optim (2013-08-23) 4 commits
1244
- (merged to 'next' on 2013-09-04 at 20c2304)
1245
- + dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
1246
- + t3010: update to demonstrate "ls-files -k" optimization pitfalls
1247
- + ls-files -k: a directory only can be killed if the index has a non-directory
1248
- + dir.c: use the cache_* macro to access the current index
1249
-
1250
- Originally merged to 'next' on 2013-08-27
1251
-
1252
- "git ls-files -k" needs to crawl only the part of the working tree
1253
- that may overlap the paths in the index to find killed files, but
1254
- shared code with the logic to find all the untracked files, which
1255
- made it unnecessarily inefficient.
1256
-
1257
- Will merge to 'master' in the third batch.
1258
-
1259
-
1260
-* es/rebase-i-no-abbrev (2013-08-25) 3 commits
1261
- (merged to 'next' on 2013-09-04 at 6027805)
1262
- + rebase -i: fix short SHA-1 collision
1263
- + t3404: rebase -i: demonstrate short SHA-1 collision
1264
- + t3404: make tests more self-contained
1265
-
1266
- Originally merged to 'next' on 2013-08-26
1267
-
1268
- The commit object names in the insn sheet that was prepared at the
1269
- beginning of "rebase -i" session can become ambiguous as the
1270
- rebasing progresses and the repository gains more commits. Make
1271
- sure the internal record is kept with full 40-hex object names.
1272
-
1273
- Will merge to 'master' in the third batch.
856
+ Will merge to 'master' in the fourth batch.
857
858
859
* ks/p4-view-spec (2013-09-03) 2 commits
1277
- - git p4: implement view spec wildcards with "p4 where"
1278
- - git p4 test: sanitize P4CHARSET
860
+ (merged to 'next' on 2013-09-10 at 8ceb2ec)
861
+ + git p4: implement view spec wildcards with "p4 where"
862
+ + git p4 test: sanitize P4CHARSET
863
864
Replaced with a reroll that was whitespace damaged.
865
1282
- Waiting for the final Ack.
1283
-
1284
-
1285
-* nd/push-no-thin (2013-08-13) 1 commit
1286
- (merged to 'next' on 2013-09-04 at faa8c02)
1287
- + push: respect --no-thin
1288
-
1289
- Originally merged to 'next' on 2013-08-14
1290
-
1291
- "git push --no-thin" was a no-op by mistake.
1292
-
1293
- Will merge to 'master' in the third batch.
1294
-
1295
-
1296
-* sh/pull-rebase-preserve (2013-09-04) 1 commit
1297
- (merged to 'next' on 2013-09-04 at 32a93bb)
1298
- + pull: allow pull to preserve merges when rebasing
1299
-
1300
- Originally merged to 'next' on 2013-08-14
1301
-
1302
- "git pull --rebase" always flattened the history; pull.rebase can
1303
- now be set to "preserve" to invoke "rebase --preserve-merges".
1304
-
1305
- Will merge to 'master' in the third batch.
1306
-
1307
-
1308
-* jn/post-receive-utf8 (2013-08-05) 3 commits
1309
- (merged to 'next' on 2013-09-04 at 3a3f480)
1310
- + hooks/post-receive-email: set declared encoding to utf-8
1311
- + hooks/post-receive-email: force log messages in UTF-8
1312
- + hooks/post-receive-email: use plumbing instead of git log/show
1313
-
1314
- Originally merged to 'next' on 2013-08-20
1315
-
1316
- Update post-receive-email script to make sure the message contents
1317
- and pathnames are encoded consistently in UTF-8.
1318
-
866
Will merge to 'master' in the third batch.
867
868
@@ -1327,22 +874,6 @@ of the repositories listed at
874
Will hold, until we get any user.
875
876
1330
-* jc/pull-training-wheel (2013-07-19) 1 commit
1331
- (merged to 'next' on 2013-08-28 at c39bd15)
1332
- + pull: require choice between rebase/merge on non-fast-forward pull
1333
-
1334
- Originally merged to 'next' on 2013-07-22
1335
-
1336
- Make "git pull" (without arguments that say what branch to
1337
- integrate from where) refuse with "it does not fast forward; choose
1338
- between 'pull --merge' and 'pull --rebase'".
1339
-
1340
- Will revert the merge, wait for the discussion to settle and
1341
- produce a replacement to queue again.
1342
-
1343
- http://thread.gmane.org/gmane.comp.version-control.git/233554/focus=234375
1344
-
1345
-
877
* jc/reflog-doc (2013-06-19) 1 commit
878
- setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
879
@@ -1383,3 +914,21 @@ of the repositories listed at
914
- diff: remove "diff-files -q" in a version of Git in a distant future
915
916
Will cook in 'next' until a distant future.
917
+
918
+--------------------------------------------------
919
+[Discarded]
920
+
921
+* jc/pull-training-wheel (2013-07-19) 1 commit
922
+ (merged to 'next' on 2013-08-28 at c39bd15)
923
+ + pull: require choice between rebase/merge on non-fast-forward pull
924
+
925
+ Originally merged to 'next' on 2013-07-22
926
+
927
+ Make "git pull" (without arguments that say what branch to
928
+ integrate from where) refuse with "it does not fast forward; choose
929
+ between 'pull --merge' and 'pull --rebase'".
930
+
931
+ This topic has been reverted from 'next'. Will wait for the
932
+ conclusion of the discussion to seek a more user-friendly
933
+ alternative; it is likely that it will be based on the simpler
934
+ approach Felipe posted earlier.