What's cooking (2014/01 #05)
Junio C Hamano committed
Jan 27, 2014 at 14:09 UTC
eb8e790486ac46484a920521bbdc444853851310
1 file changed
+257
-285
whats-cooking.txt
+257
-285
@@ -1,20 +1,21 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2014, #04; Wed, 22)
4
-X-master-at: f21e1c5d36cfbbff753cec652c21a88a129f1a27
5
-X-next-at: 8e6341d90183123bf2e9368ab83d6382c9846761
3
+Subject: What's cooking in git.git (Jan 2014, #05; Mon, 27)
4
+X-master-at: bd3e186d811a13d8687584856f345a767e3e4d67
5
+X-next-at: 0b1dcb534ef2691254edb3a0d66a3bdbbb849f98
6
7
-What's cooking in git.git (Jan 2014, #04; Wed, 22)
7
+What's cooking in git.git (Jan 2014, #05; Mon, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-I am planning to tag 1.9-rc0 preview release from the tip of
15
-'master'. Hopefully a few fix-up topics still in flight and also
16
-updates to git-gui and gitk from subarea maintainers can be merged
17
-by 1.9-rc1 is tagged.
14
+The tip of 'master' is at 1.9-rc1; as far as new features are
15
+concerned, this is pretty much it until the final.
16
+
17
+On the maintenance track, we may have another 1.8.5.x maintenance
18
+release before 1.9 final is tagged in 2-3 weeks.
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
@@ -24,85 +25,9 @@ of the repositories listed at
25
--------------------------------------------------
26
[Graduated to "master"]
27
27
-* fp/submodule-checkout-mode (2014-01-07) 1 commit
28
- (merged to 'next' on 2014-01-10 at 647ba9b)
29
- + git-submodule.sh: 'checkout' is a valid update mode
30
- (this branch is used by wk/submodule-on-branch.)
31
-
32
- "submodule.*.update=checkout", when propagated from .gitmodules to
33
- .git/config, turned into a "submodule.*.update=none", which did not
34
- make much sense.
35
-
36
-
37
-* nd/shallow-clone (2014-01-09) 31 commits
38
- (merged to 'next' on 2014-01-09 at 6608634)
39
- + t5537: fix incorrect expectation in test case 10
40
- (merged to 'next' on 2014-01-06 at 3dc7fab)
41
- + shallow: remove unused code
42
- + send-pack.c: mark a file-local function static
43
- (merged to 'next' on 2014-01-03 at a776065)
44
- + git-clone.txt: remove shallow clone limitations
45
- + prune: clean .git/shallow after pruning objects
46
- + clone: use git protocol for cloning shallow repo locally
47
- + send-pack: support pushing from a shallow clone via http
48
- + receive-pack: support pushing to a shallow clone via http
49
- + smart-http: support shallow fetch/clone
50
- + remote-curl: pass ref SHA-1 to fetch-pack as well
51
- + send-pack: support pushing to a shallow clone
52
- + receive-pack: allow pushes that update .git/shallow
53
- + connected.c: add new variant that runs with --shallow-file
54
- + add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses
55
- + receive/send-pack: support pushing from a shallow clone
56
- + receive-pack: reorder some code in unpack()
57
- + fetch: add --update-shallow to accept refs that update .git/shallow
58
- + upload-pack: make sure deepening preserves shallow roots
59
- + fetch: support fetching from a shallow repository
60
- + clone: support remote shallow repository
61
- + fetch-pack.h: one statement per bitfield declaration
62
- + fetch-pack.c: move shallow update code out of fetch_pack()
63
- + shallow.c: steps 6 and 7 to select new commits for .git/shallow
64
- + shallow.c: the 8 steps to select new commits for .git/shallow
65
- + shallow.c: extend setup_*_shallow() to accept extra shallow commits
66
- + connect.c: teach get_remote_heads to parse "shallow" lines
67
- + make the sender advertise shallow commits to the receiver
68
- + clone: prevent --reference to a shallow repository
69
- + send-pack: forbid pushing from a shallow repository
70
- + remote.h: replace struct extra_have_objects with struct sha1_array
71
- + transport.h: remove send_pack prototype, already defined in send-pack.h
72
-
73
- Fetching from a shallow-cloned repository used to be forbidden,
74
- primarily because the codepaths involved were not carefully vetted
75
- and we did not bother supporting such usage. This attempts to allow
76
- object transfer out of a shallow-cloned repository in a controlled
77
- way (i.e. the receiver become a shallow repository with truncated
78
- history).
79
-
80
---------------------------------------------------
81
-[New Topics]
82
-
83
-* jn/ignore-doc (2014-01-16) 1 commit
84
- (merged to 'next' on 2014-01-22 at a07ac63)
85
- + gitignore doc: add global gitignore to synopsis
86
-
87
- Explicitly list $HOME/.config/git/ignore as one of the places you
88
- can use to keep ignore patterns that depend on your personal choice
89
- of tools, e.g. *~ for Emacs users.
90
-
91
- Will merge to 'master'.
92
-
93
-
94
-* rk/send-email-ssl-cert (2014-01-16) 1 commit
95
- (merged to 'next' on 2014-01-22 at 2fb13f2)
96
- + send-email: /etc/ssl/certs/ directory may not be usable as ca_path
97
-
98
- The "if /etc/ssl/certs/ directory exists, explicitly tell the
99
- library to use it as SSL_ca_path" blind-defaulting in "git
100
- send-email" broke platforms where /etc/ssl/certs/ directory exists,
101
- but it cannot used as SSL_ca_path (e.g. Fedora rawhide). Fix it by
102
- not specifying any SSL_ca_path/SSL_ca_file but still asking for
103
- peer verification in such a case.
104
-
105
- Will merge to 'master'.
28
+* ab/subtree-doc (2014-01-13) 1 commit
29
+ (merged to 'next' on 2014-01-22 at e352c75)
30
+ + subtree: fix argument validation in add/pull/push
31
32
33
* ef/mingw-write (2014-01-17) 2 commits
@@ -110,27 +35,38 @@ of the repositories listed at
35
+ mingw: remove mingw_write
36
+ prefer xwrite instead of write
37
113
- Will merge to 'master'.
38
39
+* jc/maint-pull-docfix (2014-01-14) 2 commits
40
+ (merged to 'next' on 2014-01-22 at 2e62ef4)
41
+ + Documentation: "git pull" does not have the "-m" option
42
+ + Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix
43
+ (this branch uses jc/maint-pull-docfix-for-409b8d82.)
44
116
-* jk/branch-at-publish-rebased (2014-01-17) 5 commits
117
- - t1507 (rev-parse-upstream): fix typo in test title
118
- - implement @{publish} shorthand
119
- - branch_get: provide per-branch pushremote pointers
120
- - branch_get: return early on error
121
- - sha1_name: refactor upstream_mark
122
- (this branch uses jk/interpret-branch-name-fix.)
45
124
- Give an easier access to the tracking branches from "other" side in
125
- a triangular workflow by introducing B@{publish} that works in a
126
- similar way to how B@{upstream} does.
46
+* jc/revision-range-unpeel (2014-01-15) 2 commits
47
+ (merged to 'next' on 2014-01-22 at ab2a159)
48
+ + revision: propagate flag bits from tags to pointees
49
+ + revision: mark contents of an uninteresting tree uninteresting
50
+
51
+ "git log --left-right A...B" lost the "leftness" of commits
52
+ reachable from A when A is a tag as a side effect of a recent
53
+ bugfix. This is a regression in 1.8.4.x series.
54
55
129
-* jk/color-for-more-pagers (2014-01-17) 4 commits
130
- - pager: disable colors for some known-bad configurations
131
- - DONOTMERGE: needs matching change to git-sh-setup
132
- - setup_pager: set MORE=R
133
- - setup_pager: refactor LESS/LV environment setting
56
+* jk/allow-fetch-onelevel-refname (2014-01-15) 1 commit
57
+ (merged to 'next' on 2014-01-22 at 15089b1)
58
+ + fetch-pack: do not filter out one-level refs
59
+
60
+ "git clone" would fail to clone from a repository that has a ref
61
+ directly under "refs/", e.g. "refs/stash", because different
62
+ validation paths do different things on such a refname. Loosen the
63
+ client side's validation to allow such a ref.
64
+
65
+
66
+* jk/complete-merge-base (2014-01-13) 2 commits
67
+ (merged to 'next' on 2014-01-22 at 91c428d)
68
+ + completion: handle --[no-]fork-point options to git-rebase
69
+ + completion: complete merge-base options
70
71
72
* jk/diff-filespec-cleanup (2014-01-17) 5 commits
@@ -141,40 +77,19 @@ of the repositories listed at
77
+ diff_filespec: drop funcname_pattern_ident field
78
+ diff_filespec: reorder dirty_submodule macro definitions
79
144
- Will merge to 'master'.
145
-
146
-
147
-* cc/interpret-trailers (2014-01-21) 17 commits
148
- - DONOTMERGE: style issues, unused funcs, etc.
149
- - trailer: add tests for commands using env variables
150
- - trailer: set author and committer env variables
151
- - trailer: add tests for trailer command
152
- - trailer: execute command from 'trailer.<name>.command'
153
- - strbuf: add strbuf_replace()
154
- - trailer: add new_trailer_item() function
155
- - trailer: if no input file is passed, read from stdin
156
- - trailer: add tests for "git interpret-trailers"
157
- - trailer: add interpret-trailers command
158
- - trailer: put all the processing together and print
159
- - trailer: parse trailers from input file
160
- - strbuf: add strbuf_isspace()
161
- - trailer: process command line trailer arguments
162
- - trailer: read and process config information
163
- - trailer: process trailers from file and arguments
164
- - Add data structures and basic functions for commit trailers
165
-
166
-
167
-* dk/blame-janitorial (2014-01-22) 2 commits
168
- - Eliminate same_suspect function in builtin/blame.c
169
- - builtin/blame.c: struct blame_entry does not need a prev link
80
81
+* jk/interpret-branch-name-fix (2014-01-15) 5 commits
82
+ (merged to 'next' on 2014-01-22 at f113c68)
83
+ + interpret_branch_name: find all possible @-marks
84
+ + interpret_branch_name: avoid @{upstream} past colon
85
+ + interpret_branch_name: always respect "namelen" parameter
86
+ + interpret_branch_name: rename "cp" variable to "at"
87
+ + interpret_branch_name: factor out upstream handling
88
+ (this branch is used by jk/branch-at-publish-rebased.)
89
172
-* jc/parse-options-humint (2014-01-22) 2 commits
173
- - repack: accept larger window-memory and max-pack-size
174
- - parse-options: refactor human-friendly-integer parser out of pack-objects
175
-
176
- "git repack --max-pack-size=8g" stopped being parsed correctly when
177
- the command was reimplemented in C.
90
+ Fix a handful of bugs around interpreting $branch@{upstream}
91
+ notation and its lookalike, when $branch part has interesting
92
+ characters, e.g. "@", and ":".
93
94
95
* jk/mark-edges-uninteresting (2014-01-21) 2 commits
@@ -184,31 +99,62 @@ of the repositories listed at
99
100
Fix to regression in v1.8.4.x and later.
101
187
- Will merge to 'master'.
102
103
+* jk/test-fixes (2014-01-23) 2 commits
104
+ (merged to 'next' on 2014-01-23 at 6515089)
105
+ + t7700: do not use "touch" unnecessarily
106
+ + t7501: fix "empty commit" test with NO_PERL
107
190
-* ks/diff-c-with-diff-order (2014-01-21) 4 commits
191
- - combine-diff: combine_diff_path.len is not needed anymore
192
- - combine-diff: Optimize combine_diff_path sets intersection
193
- - diff test: Add tests for combine-diff with orderfile
194
- - diffcore-order: Export generic ordering interface
108
196
- Teach combine-diff to honour the path-output-order imposed by
197
- diffcore-order.
109
+* jn/ignore-doc (2014-01-16) 1 commit
110
+ (merged to 'next' on 2014-01-22 at a07ac63)
111
+ + gitignore doc: add global gitignore to synopsis
112
113
+ Explicitly list $HOME/.config/git/ignore as one of the places you
114
+ can use to keep ignore patterns that depend on your personal choice
115
+ of tools, e.g. *~ for Emacs users.
116
200
-* tr/gitk-doc-range-trace (2014-01-21) 1 commit
201
- (merged to 'next' on 2014-01-22 at 1d93d1d)
202
- + Documentation/gitk: document -L option
117
204
- Will merge to 'master'.
118
+* mh/attr-macro-doc (2014-01-14) 1 commit
119
+ (merged to 'next' on 2014-01-22 at e3ed767)
120
+ + gitattributes: document more clearly where macros are allowed
121
122
207
-* tr/nth-previous-is-a-commit (2014-01-21) 1 commit
208
- (merged to 'next' on 2014-01-22 at 0425887)
209
- + Documentation: @{-N} can refer to a commit
123
+* mh/retire-ref-fetch-rules (2014-01-14) 1 commit
124
+ (merged to 'next' on 2014-01-22 at 753b1f6)
125
+ + refname_match(): always use the rules in ref_rev_parse_rules
126
211
- Will merge to 'master'.
127
+ Code simplification.
128
+
129
+
130
+* mh/safe-create-leading-directories (2014-01-21) 17 commits
131
+ (merged to 'next' on 2014-01-22 at ad38e73)
132
+ + rename_tmp_log(): on SCLD_VANISHED, retry
133
+ + rename_tmp_log(): limit the number of remote_empty_directories() attempts
134
+ + rename_tmp_log(): handle a possible mkdir/rmdir race
135
+ + rename_ref(): extract function rename_tmp_log()
136
+ + remove_dir_recurse(): handle disappearing files and directories
137
+ + remove_dir_recurse(): tighten condition for removing unreadable dir
138
+ + lock_ref_sha1_basic(): if locking fails with ENOENT, retry
139
+ + lock_ref_sha1_basic(): on SCLD_VANISHED, retry
140
+ + safe_create_leading_directories(): add new error value SCLD_VANISHED
141
+ + cmd_init_db(): when creating directories, handle errors conservatively
142
+ + safe_create_leading_directories(): introduce enum for return values
143
+ + safe_create_leading_directories(): always restore slash at end of loop
144
+ + safe_create_leading_directories(): split on first of multiple slashes
145
+ + safe_create_leading_directories(): rename local variable
146
+ + safe_create_leading_directories(): add explicit "slash" pointer
147
+ + safe_create_leading_directories(): reduce scope of local variable
148
+ + safe_create_leading_directories(): fix format of "if" chaining
149
+ (this branch is used by ss/safe-create-leading-dir-with-slash.)
150
+
151
+ Code clean-up and protection against concurrent write access to the
152
+ ref namespace.
153
+
154
+
155
+* nd/negative-pathspec (2014-01-23) 1 commit
156
+ (merged to 'next' on 2014-01-23 at fd64119)
157
+ + tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()
158
159
160
* pw/git-p4 (2014-01-22) 11 commits
@@ -227,11 +173,118 @@ of the repositories listed at
173
174
Various "git p4" updates.
175
230
- Will merge to 'master'.
176
+
177
+* rk/send-email-ssl-cert (2014-01-16) 1 commit
178
+ (merged to 'next' on 2014-01-22 at 2fb13f2)
179
+ + send-email: /etc/ssl/certs/ directory may not be usable as ca_path
180
+
181
+ The "if /etc/ssl/certs/ directory exists, explicitly tell the
182
+ library to use it as SSL_ca_path" blind-defaulting in "git
183
+ send-email" broke platforms where /etc/ssl/certs/ directory exists,
184
+ but it cannot used as SSL_ca_path (e.g. Fedora rawhide). Fix it by
185
+ not specifying any SSL_ca_path/SSL_ca_file but still asking for
186
+ peer verification in such a case.
187
+
188
+
189
+* sb/repack-in-c (2014-01-23) 3 commits
190
+ (merged to 'next' on 2014-01-23 at 3ff349f)
191
+ + repack: propagate pack-objects options as strings
192
+ + repack: make parsed string options const-correct
193
+ + repack: fix typo in max-pack-size option
194
+
195
+ "git repack --max-pack-size=8g" stopped being parsed correctly when
196
+ the command was reimplemented in C.
197
+
198
+
199
+* ss/safe-create-leading-dir-with-slash (2014-01-22) 1 commit
200
+ (merged to 'next' on 2014-01-22 at ca62c45)
201
+ + safe_create_leading_directories(): on Windows, \ can separate path components
202
+ (this branch uses mh/safe-create-leading-directories.)
203
+
204
+ "git clone $origin foo\bar\baz" on Windows failed to create the
205
+ leading directories (i.e. a moral-equivalent of "mkdir -p").
206
+
207
+
208
+* tr/gitk-doc-range-trace (2014-01-21) 1 commit
209
+ (merged to 'next' on 2014-01-22 at 1d93d1d)
210
+ + Documentation/gitk: document -L option
211
+
212
+
213
+* tr/nth-previous-is-a-commit (2014-01-21) 1 commit
214
+ (merged to 'next' on 2014-01-22 at 0425887)
215
+ + Documentation: @{-N} can refer to a commit
216
+
217
+--------------------------------------------------
218
+[New Topics]
219
+
220
+* lt/request-pull (2014-01-23) 3 commits
221
+ - pull-request: test updates
222
+ - Make request-pull able to take a refspec of form local:remote
223
+ - Make 'git request-pull' more strict about matching
224
+
225
+ Waiting for the updates to settle.
226
+
227
+
228
+* bk/refresh-missing-ok-in-merge-recursive (2014-01-27) 4 commits
229
+ - merge-recursive.c: Tolerate missing files while refreshing index
230
+ - read-cache.c: Extend make_cache_entry refresh flag with options
231
+ - read-cache.c: Refactor --ignore-missing implementation
232
+ - t3030-merge-recursive: Test known breakage with empty work tree
233
+
234
+ Will merge to 'next'.
235
+
236
+
237
+* nd/diff-quiet-stat-dirty (2014-01-27) 3 commits
238
+ - diff: turn off skip_stat_unmatch on "diff --cached"
239
+ - diff: do not quit early on stat-dirty files
240
+ - Move diffcore_skip_stat_unmatch core logic out for reuse later
241
+
242
+ Will merge to 'next'.
243
244
--------------------------------------------------
245
[Stalled]
246
247
+* jk/color-for-more-pagers (2014-01-17) 4 commits
248
+ - pager: disable colors for some known-bad configurations
249
+ - DONOTMERGE: needs matching change to git-sh-setup
250
+ - setup_pager: set MORE=R
251
+ - setup_pager: refactor LESS/LV environment setting
252
+
253
+ 'more' implementation of BSD wants to be told with MORE=R
254
+ environment before it shows colored output, while 'more' on some
255
+ other platforms will die when seeing MORE=R environment.
256
+
257
+ It appears that we are coming to the consensus that trying to be
258
+ too intimately knowledgeable about quirks of various pager
259
+ implementations on different platforms is a losing proposition, so
260
+ perhaps I should replace this with the alternative and simpler
261
+ approach I posted, unless there are strong objections.
262
+
263
+
264
+* po/everyday-doc (2014-01-27) 1 commit
265
+ - Make 'git help everyday' work
266
+
267
+ This may make the said command to emit something, but the source is
268
+ not meant to be formatted into a manual pages to begin with, and
269
+ also its contents are a bit stale. It may be a good first step in
270
+ the right direction, but needs more work to at least get the
271
+ mark-up right before public consumption.
272
+
273
+
274
+* jk/branch-at-publish-rebased (2014-01-17) 5 commits
275
+ - t1507 (rev-parse-upstream): fix typo in test title
276
+ - implement @{publish} shorthand
277
+ - branch_get: provide per-branch pushremote pointers
278
+ - branch_get: return early on error
279
+ - sha1_name: refactor upstream_mark
280
+
281
+ Give an easier access to the tracking branches from "other" side in
282
+ a triangular workflow by introducing B@{publish} that works in a
283
+ similar way to how B@{upstream} does.
284
+
285
+ Will hold.
286
+
287
+
288
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
289
- merge: drop unused arg from abort_commit method signature
290
- merge: make prepare_to_commit responsible for write_merge_state
@@ -465,23 +518,43 @@ of the repositories listed at
518
--------------------------------------------------
519
[Cooking]
520
468
-* ab/subtree-doc (2014-01-13) 1 commit
469
- (merged to 'next' on 2014-01-22 at e352c75)
470
- + subtree: fix argument validation in add/pull/push
521
+* cc/interpret-trailers (2014-01-27) 17 commits
522
+ - Documentation: add documentation for 'git interpret-trailers'
523
+ - trailer: add tests for commands using env variables
524
+ - trailer: set author and committer env variables
525
+ - trailer: add tests for trailer command
526
+ - trailer: execute command from 'trailer.<name>.command'
527
+ - strbuf: add strbuf_replace()
528
+ - trailer: add new_trailer_item() function
529
+ - trailer: if no input file is passed, read from stdin
530
+ - trailer: add tests for "git interpret-trailers"
531
+ - trailer: add interpret-trailers command
532
+ - trailer: put all the processing together and print
533
+ - trailer: parse trailers from input file
534
+ - strbuf: add strbuf_isspace()
535
+ - trailer: process command line trailer arguments
536
+ - trailer: read and process config information
537
+ - trailer: process trailers from file and arguments
538
+ - Add data structures and basic functions for commit trailers
539
472
- Will merge to 'master'.
540
541
+* dk/blame-janitorial (2014-01-22) 2 commits
542
+ - Eliminate same_suspect function in builtin/blame.c
543
+ - builtin/blame.c: struct blame_entry does not need a prev link
544
475
-* jk/complete-merge-base (2014-01-13) 2 commits
476
- (merged to 'next' on 2014-01-22 at 91c428d)
477
- + completion: handle --[no-]fork-point options to git-rebase
478
- + completion: complete merge-base options
545
+ Will merge to 'next'.
546
480
- Will merge to 'master'.
547
548
+* ks/diff-c-with-diff-order (2014-01-21) 4 commits
549
+ - combine-diff: combine_diff_path.len is not needed anymore
550
+ - combine-diff: Optimize combine_diff_path sets intersection
551
+ - diff test: Add tests for combine-diff with orderfile
552
+ - diffcore-order: Export generic ordering interface
553
483
-* po/everyday-doc (2014-01-13) 1 commit
484
- - Make 'git help everyday' work
554
+ Teach combine-diff to honour the path-output-order imposed by
555
+ diffcore-order.
556
+
557
+ Will merge to 'next'.
558
559
560
* bl/blame-full-history (2014-01-14) 1 commit
@@ -511,80 +584,8 @@ of the repositories listed at
584
Will cook in 'next'.
585
586
514
-* jc/maint-pull-docfix-for-409b8d82 (2014-01-14) 1 commit
515
- + Documentation: exclude irrelevant options from "git pull"
516
- (this branch is used by jc/maint-pull-docfix.)
517
-
518
-
519
-* jc/maint-pull-docfix (2014-01-14) 2 commits
520
- (merged to 'next' on 2014-01-22 at 2e62ef4)
521
- + Documentation: "git pull" does not have the "-m" option
522
- + Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix
523
- (this branch uses jc/maint-pull-docfix-for-409b8d82.)
524
-
525
- Will merge to 'master'.
526
-
527
-
528
-* jc/revision-range-unpeel (2014-01-15) 2 commits
529
- (merged to 'next' on 2014-01-22 at ab2a159)
530
- + revision: propagate flag bits from tags to pointees
531
- + revision: mark contents of an uninteresting tree uninteresting
532
-
533
- "git log --left-right A...B" lost the "leftness" of commits
534
- reachable from A when A is a tag as a side effect of a recent
535
- bugfix. This is a regression in 1.8.4.x series.
536
-
537
- Will merge to 'master'.
538
-
539
-
540
-* jk/allow-fetch-onelevel-refname (2014-01-15) 1 commit
541
- (merged to 'next' on 2014-01-22 at 15089b1)
542
- + fetch-pack: do not filter out one-level refs
543
-
544
- "git clone" would fail to clone from a repository that has a ref
545
- directly under "refs/", e.g. "refs/stash", because different
546
- validation paths do different things on such a refname. Loosen the
547
- client side's validation to allow such a ref.
548
-
549
- Will merge to 'master'.
550
-
551
-
552
-* jk/interpret-branch-name-fix (2014-01-15) 5 commits
553
- (merged to 'next' on 2014-01-22 at f113c68)
554
- + interpret_branch_name: find all possible @-marks
555
- + interpret_branch_name: avoid @{upstream} past colon
556
- + interpret_branch_name: always respect "namelen" parameter
557
- + interpret_branch_name: rename "cp" variable to "at"
558
- + interpret_branch_name: factor out upstream handling
559
- (this branch is used by jk/branch-at-publish-rebased.)
560
-
561
- Fix a handful of bugs around interpreting $branch@{upstream}
562
- notation and its lookalike, when $branch part has interesting
563
- characters, e.g. "@", and ":".
564
-
565
- Will merge to 'master'.
566
-
567
-
568
-* mh/attr-macro-doc (2014-01-14) 1 commit
569
- (merged to 'next' on 2014-01-22 at e3ed767)
570
- + gitattributes: document more clearly where macros are allowed
571
-
572
- Will merge to 'master'.
573
-
574
-
575
-* mh/retire-ref-fetch-rules (2014-01-14) 1 commit
576
- (merged to 'next' on 2014-01-22 at 753b1f6)
577
- + refname_match(): always use the rules in ref_rev_parse_rules
578
-
579
- Code simplification.
580
-
581
- Will merge to 'master'.
582
-
583
-
584
-* wk/submodule-on-branch (2014-01-16) 6 commits
585
- - Documentation: Describe 'submodule update' modes in detail
586
- - t7406: Add explicit tests for head attachement after cloning updates
587
- - [DONOTMERGE] t7406: Just-cloned checkouts update to the gitlinked hash with 'reset'
587
+* wk/submodule-on-branch (2014-01-27) 4 commits
588
+ - Documentation: Describe 'submodule update --remote' use case
589
- submodule: Explicit local branch creation in module_clone
590
- submodule: Document module_clone arguments in comments
591
- submodule: Make 'checkout' update_module explicit
@@ -596,8 +597,6 @@ of the repositories listed at
597
This round seems to be almost ready; further discussions are of
598
course very much welcomed.
599
599
- Waiting for another reroll to fix minor nits, at least.
600
-
600
601
* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits
602
- get_sha1: drop object/refname ambiguity flag
@@ -617,45 +616,11 @@ of the repositories listed at
616
Expecting a reroll.
617
618
620
-* ss/safe-create-leading-dir-with-slash (2014-01-22) 1 commit
621
- (merged to 'next' on 2014-01-22 at ca62c45)
622
- + safe_create_leading_directories(): on Windows, \ can separate path components
623
- (this branch uses mh/safe-create-leading-directories.)
624
-
625
- "git clone $origin foo\bar\baz" on Windows failed to create the
626
- leading directories (i.e. a moral-equivalent of "mkdir -p").
627
-
628
- Will merge to 'master'.
629
-
630
-
631
-* mh/safe-create-leading-directories (2014-01-21) 17 commits
632
- (merged to 'next' on 2014-01-22 at ad38e73)
633
- + rename_tmp_log(): on SCLD_VANISHED, retry
634
- + rename_tmp_log(): limit the number of remote_empty_directories() attempts
635
- + rename_tmp_log(): handle a possible mkdir/rmdir race
636
- + rename_ref(): extract function rename_tmp_log()
637
- + remove_dir_recurse(): handle disappearing files and directories
638
- + remove_dir_recurse(): tighten condition for removing unreadable dir
639
- + lock_ref_sha1_basic(): if locking fails with ENOENT, retry
640
- + lock_ref_sha1_basic(): on SCLD_VANISHED, retry
641
- + safe_create_leading_directories(): add new error value SCLD_VANISHED
642
- + cmd_init_db(): when creating directories, handle errors conservatively
643
- + safe_create_leading_directories(): introduce enum for return values
644
- + safe_create_leading_directories(): always restore slash at end of loop
645
- + safe_create_leading_directories(): split on first of multiple slashes
646
- + safe_create_leading_directories(): rename local variable
647
- + safe_create_leading_directories(): add explicit "slash" pointer
648
- + safe_create_leading_directories(): reduce scope of local variable
649
- + safe_create_leading_directories(): fix format of "if" chaining
650
- (this branch is used by ss/safe-create-leading-dir-with-slash.)
651
-
652
- Code clean-up and protection against concurrent write access to the
653
- ref namespace.
654
-
655
- Will merge to 'master'.
656
-
657
-
658
-* jk/pack-bitmap (2014-01-16) 22 commits
619
+* jk/pack-bitmap (2014-01-23) 25 commits
620
+ (merged to 'next' on 2014-01-27 at 0b1dcb5)
621
+ + ewah: support platforms that require aligned reads
622
+ + read-cache: use get_be32 instead of hand-rolled ntoh_l
623
+ + block-sha1: factor out get_be and put_be wrappers
624
(merged to 'next' on 2014-01-16 at ddac2d2)
625
+ do not discard revindex when re-preparing packfiles
626
(merged to 'next' on 2014-01-10 at bdbe0a4)
@@ -703,13 +668,6 @@ of the repositories listed at
668
Will cook in 'next'.
669
670
706
-* jn/gitk-chmod+x (2013-11-25) 1 commit
707
- - gitk: chmod +x po2msg
708
-
709
- Parked here until I get the same change back from the upstream gitk
710
- tree.
711
-
712
-
671
* cc/starts-n-ends-with-endgame (2013-12-05) 1 commit
672
(merged to 'next' on 2014-01-07 at 4cdf8d0)
673
+ strbuf: remove prefixcmp() and suffixcmp()
@@ -798,3 +756,17 @@ of the repositories listed at
756
. git-gui: chmod +x po2msg, windows/git-gui.sh
757
758
Now in 'master' from the upstream git-gui repository.
759
+
760
+
761
+* jn/gitk-chmod+x (2013-11-25) 1 commit
762
+ . gitk: chmod +x po2msg
763
+
764
+ Now in 'master' from the upstream gitk repository.
765
+
766
+
767
+* jc/parse-options-humint (2014-01-22) 2 commits
768
+ . repack: accept larger window-memory and max-pack-size
769
+ . parse-options: refactor human-friendly-integer parser out of pack-objects
770
+
771
+ "git repack --max-pack-size=8g" stopped being parsed correctly when
772
+ the command was reimplemented in C.