What's cooking (2016/12 #05)
Junio C Hamano committed
Dec 19, 2016 at 16:17 UTC
b4843ea81184f1e3b2d24ec1beea55be9efbdee1
1 file changed
+432
-534
whats-cooking.txt
+432
-534
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2016, #04; Fri, 16)
4
-X-master-at: eff96d7e16a769dca9b0319ccf460a83f514676e
5
-X-next-at: f8bf8f2a7b2b08001fdf3e1c554eef9249e47c19
3
+Subject: What's cooking in git.git (Dec 2016, #05; Mon, 19)
4
+X-master-at: 6610af872f6494a061780ec738c8713a034b848b
5
+X-next-at: 4f4050513f839a9c6e56bdec20cbd1a1cb924ef8
6
7
-What's cooking in git.git (Dec 2016, #04; Fri, 16)
7
+What's cooking in git.git (Dec 2016, #05; Mon, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
+The second (rather large) batch of topics have been merged to
16
+'master'. Please test and catch possible regressions early.
17
+
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
@@ -20,252 +23,311 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
23
-* ak/lazy-prereq-mktemp (2016-11-29) 1 commit
24
- (merged to 'next' on 2016-12-12 at f346d1f053)
25
- + t7610: clean up foo.XXXXXX tmpdir
26
+* ah/grammos (2016-12-05) 3 commits
27
+ (merged to 'next' on 2016-12-12 at 13ad487b28)
28
+ + clone,fetch: explain the shallow-clone option a little more clearly
29
+ + receive-pack: improve English grammar of denyCurrentBranch message
30
+ + bisect: improve English grammar of not-ancestors message
31
27
- Test code clean-up.
32
+ A few messages have been fixed for their grammatical errors.
33
34
30
-* bw/push-dry-run (2016-11-23) 2 commits
31
- (merged to 'next' on 2016-12-12 at bde7a0f9ae)
32
- + push: fix --dry-run to not push submodules
33
- + push: --dry-run updates submodules when --recurse-submodules=on-demand
34
- (this branch uses hv/submodule-not-yet-pushed-fix; is tangled with sb/push-make-submodule-check-the-default.)
35
+* ak/commit-only-allow-empty (2016-12-09) 2 commits
36
+ (merged to 'next' on 2016-12-12 at 54188ab23c)
37
+ + commit: remove 'Clever' message for --only --amend
38
+ + commit: make --only --allow-empty work without paths
39
36
- "git push --dry-run --recurse-submodule=on-demand" wasn't
37
- "--dry-run" in the submodules.
40
+ "git commit --allow-empty --only" (no pathspec) with dirty index
41
+ ought to be an acceptable way to create a new commit that does not
42
+ change any paths, but it was forbidden, perhaps because nobody
43
+ needed it so far.
44
45
40
-* da/mergetool-trust-exit-code (2016-11-29) 2 commits
41
- (merged to 'next' on 2016-12-12 at 28ae202868)
42
- + mergetools/vimdiff: trust Vim's exit code
43
- + mergetool: honor mergetool.$tool.trustExitCode for built-in tools
46
+* bb/unicode-9.0 (2016-12-14) 6 commits
47
+ (merged to 'next' on 2016-12-16 at be2531431a)
48
+ + unicode_width.h: update the width tables to Unicode 9.0
49
+ + update_unicode.sh: remove the plane filter
50
+ + update_unicode.sh: automatically download newer definition files
51
+ + update_unicode.sh: pin the uniset repo to a known good commit
52
+ + update_unicode.sh: remove an unnecessary subshell level
53
+ + update_unicode.sh: move it into contrib/update-unicode
54
45
- mergetool.<tool>.trustExitCode configuration variable did not apply
46
- to built-in tools, but now it does.
55
+ The character width table has been updated to match Unicode 9.0
56
57
49
-* dt/empty-submodule-in-merge (2016-11-17) 1 commit
50
- (merged to 'next' on 2016-12-12 at 6de2350b2b)
51
- + submodules: allow empty working-tree dirs in merge/cherry-pick
58
+* da/difftool-dir-diff-fix (2016-12-08) 1 commit
59
+ (merged to 'next' on 2016-12-12 at fd31a92ad6)
60
+ + difftool: fix dir-diff index creation when in a subdirectory
61
53
- An empty directory in a working tree that can simply be nuked used
54
- to interfere while merging or cherry-picking a change to create a
55
- submodule directory there, which has been fixed..
62
+ "git difftool --dir-diff" had a minor regression when started from
63
+ a subdirectory, which has been fixed.
64
65
58
-* hv/submodule-not-yet-pushed-fix (2016-11-16) 4 commits
59
- (merged to 'next' on 2016-12-05 at c9d729fca2)
60
- + submodule_needs_pushing(): explain the behaviour when we cannot answer
61
- + batch check whether submodule needs pushing into one call
62
- + serialize collection of refs that contain submodule changes
63
- + serialize collection of changed submodules
64
- (this branch is used by bw/push-dry-run and sb/push-make-submodule-check-the-default.)
66
+* da/mergetool-xxdiff-hotkey (2016-12-11) 1 commit
67
+ (merged to 'next' on 2016-12-13 at a08f375c81)
68
+ + mergetools: fix xxdiff hotkeys
69
66
- Originally merged to 'next' on 2016-11-21
70
+ The way to specify hotkeys to "xxdiff" that is used by "git
71
+ mergetool" has been modernized to match recent versions of xxdiff.
72
68
- The code in "git push" to compute if any commit being pushed in the
69
- superproject binds a commit in a submodule that hasn't been pushed
70
- out was overly inefficient, making it unusable even for a small
71
- project that does not have any submodule but have a reasonable
72
- number of refs.
73
74
+* jb/diff-no-index-no-abbrev (2016-12-08) 1 commit
75
+ (merged to 'next' on 2016-12-12 at 959981ef50)
76
+ + diff: handle --no-abbrev in no-index case
77
75
-* jk/rev-parse-symbolic-parents-fix (2016-11-16) 1 commit
76
- (merged to 'next' on 2016-12-12 at 6839c1ea28)
77
- + rev-parse: fix parent shorthands with --symbolic
78
+ "git diff --no-index" did not take "--no-abbrev" option.
79
79
- "git rev-parse --symbolic" failed with a more recent notation like
80
- "HEAD^-1" and "HEAD^!".
80
81
+* jc/lock-report-on-error (2016-12-07) 3 commits
82
+ (merged to 'next' on 2016-12-13 at cb6c07ee92)
83
+ + lockfile: LOCK_REPORT_ON_ERROR
84
+ + hold_locked_index(): align error handling with hold_lockfile_for_update()
85
+ + wt-status: implement opportunisitc index update correctly
86
83
-* ld/p4-update-shelve (2016-12-05) 1 commit
84
- (merged to 'next' on 2016-12-12 at 22f6bec94c)
85
- + git-p4: support updating an existing shelved changelist
86
- (this branch uses vk/p4-submit-shelve.)
87
+ Git 2.11 had a minor regression in "merge --ff-only" that competed
88
+ with another process that simultanously attempted to update the
89
+ index. We used to explain what went wrong with an error message,
90
+ but the new code silently failed. The error message has been
91
+ resurrected.
92
88
- Will merge to 'master'.
93
94
+* jc/pull-rebase-ff (2016-11-29) 1 commit
95
+ (merged to 'next' on 2016-12-16 at c1a0cedd9e)
96
+ + pull: fast-forward "pull --rebase=true"
97
91
-* ls/p4-empty-file-on-lfs (2016-12-05) 1 commit
92
- (merged to 'next' on 2016-12-12 at 1fce8e037a)
93
- + git-p4: fix empty file processing for large file system backend GitLFS
98
+ "git pull --rebase", when there is no new commits on our side since
99
+ we forked from the upstream, should be able to fast-forward without
100
+ invoking "git rebase", but it didn't.
101
95
- "git p4" LFS support was broken when LFS stores an empty blob.
102
103
+* jc/renormalize-merge-kill-safer-crlf (2016-12-01) 4 commits
104
+ (merged to 'next' on 2016-12-12 at 041b834f81)
105
+ + convert: git cherry-pick -Xrenormalize did not work
106
+ + Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf
107
+ + merge-recursive: handle NULL in add_cacheinfo() correctly
108
+ + cherry-pick: demonstrate a segmentation fault
109
98
-* ls/p4-retry-thrice (2016-12-05) 1 commit
99
- (merged to 'next' on 2016-12-12 at 9462e660a8)
100
- + git-p4: add config to retry p4 commands; retry 3 times by default
110
+ Fix a corner case in merge-recursive regression that crept in
111
+ during 2.10 development cycle.
112
102
- Will merge to 'master'.
113
114
+* jk/http-walker-limit-redirect (2016-12-06) 2 commits
115
+ (merged to 'next' on 2016-12-12 at 8b58025e3a)
116
+ + http-walker: complain about non-404 loose object errors
117
+ + Merge branch 'ew/http-walker' into jk/http-walker-limit-redirect
118
+ (this branch is used by bw/transport-protocol-policy; uses jk/http-walker-limit-redirect-2.9.)
119
105
-* nd/qsort-in-merge-recursive (2016-11-28) 1 commit
106
- (merged to 'next' on 2016-12-12 at e9700f5b93)
107
- + merge-recursive.c: use string_list_sort instead of qsort
120
+ Update the error messages from the dumb-http client when it fails
121
+ to obtain loose objects; we used to give sensible error message
122
+ only upon 404 but we now forbid unexpected redirects that needs to
123
+ be reported with something sensible.
124
109
- Code simplification.
125
126
+* jk/http-walker-limit-redirect-2.9 (2016-12-06) 5 commits
127
+ (merged to 'next' on 2016-12-12 at 3e4bcd7bca)
128
+ + http: treat http-alternates like redirects
129
+ + http: make redirects more obvious
130
+ + remote-curl: rename shadowed options variable
131
+ + http: always update the base URL for redirects
132
+ + http: simplify update_url_from_redirect
133
+ (this branch is used by bw/transport-protocol-policy and jk/http-walker-limit-redirect.)
134
112
-* nd/worktree-list-fixup (2016-11-28) 5 commits
113
- (merged to 'next' on 2016-12-12 at 1f46421a59)
114
- + worktree list: keep the list sorted
115
- + worktree.c: get_worktrees() takes a new flag argument
116
- + get_worktrees() must return main worktree as first item even on error
117
- + worktree: reorder an if statement
118
- + worktree.c: zero new 'struct worktree' on allocation
119
- (this branch is used by nd/worktree-move and sb/submodule-embed-gitdir.)
135
+ Transport with dumb http can be fooled into following foreign URLs
136
+ that the end user does not intend to, especially with the server
137
+ side redirects and http-alternates mechanism, which can lead to
138
+ security issues. Tighten the redirection and make it more obvious
139
+ to the end user when it happens.
140
121
- The output from "git worktree list" was made in readdir() order,
122
- and was unstable.
141
142
+* jk/make-tags-find-sources-tweak (2016-12-14) 4 commits
143
+ (merged to 'next' on 2016-12-16 at 06d0b0fbfd)
144
+ + Makefile: exclude contrib from FIND_SOURCE_FILES
145
+ + Makefile: match shell scripts in FIND_SOURCE_FILES
146
+ + Makefile: exclude test cruft from FIND_SOURCE_FILES
147
+ + Makefile: reformat FIND_SOURCE_FILES
148
125
-* vk/p4-submit-shelve (2016-11-29) 1 commit
126
- (merged to 'next' on 2016-12-12 at 3fce6df117)
127
- + git-p4: allow submit to create shelved changelists.
128
- (this branch is used by ld/p4-update-shelve.)
149
+ Update the procedure to generate "tags" for developer support.
150
130
- Will merge to 'master'.
151
132
---------------------------------------------------
133
-[New Topics]
152
+* jk/readme-gmane-is-no-more (2016-12-15) 1 commit
153
+ (merged to 'next' on 2016-12-16 at 44ad5c5205)
154
+ + README: replace gmane link with public-inbox
155
135
-* bw/pathspec-cleanup (2016-12-14) 16 commits
136
- - pathspec: rename prefix_pathspec to init_pathspec_item
137
- - pathspec: small readability changes
138
- - pathspec: create strip submodule slash helpers
139
- - pathspec: create parse_element_magic helper
140
- - pathspec: create parse_long_magic function
141
- - pathspec: create parse_short_magic function
142
- - pathspec: factor global magic into its own function
143
- - pathspec: simpler logic to prefix original pathspec elements
144
- - pathspec: always show mnemonic and name in unsupported_magic
145
- - pathspec: remove unused variable from unsupported_magic
146
- - pathspec: copy and free owned memory
147
- - pathspec: remove the deprecated get_pathspec function
148
- - ls-tree: convert show_recursive to use the pathspec struct interface
149
- - dir: convert fill_directory to use the pathspec struct interface
150
- - dir: remove struct path_simplify
151
- - mv: remove use of deprecated 'get_pathspec()'
156
153
- Code clean-up in the pathspec API.
157
+* jk/stash-disable-renames-internally (2016-12-06) 1 commit
158
+ (merged to 'next' on 2016-12-12 at e2b97aae68)
159
+ + stash: prefer plumbing over git-diff
160
155
- Waiting for the (hopefully) final round of review before 'next'.
161
+ When diff.renames configuration is on (and with Git 2.9 and later,
162
+ it is enabled by default, which made it worse), "git stash"
163
+ misbehaved if a file is removed and another file with a very
164
+ similar content is added.
165
166
158
-* cp/merge-continue (2016-12-15) 4 commits
159
- - merge: mark usage error strings for translation
160
- - merge: ensure '--abort' option takes no arguments
161
- - completion: add --continue option for merge
162
- - merge: add '--continue' option as a synonym for 'git commit'
167
+* jk/trailers-placeholder-in-pretty (2016-12-11) 2 commits
168
+ (merged to 'next' on 2016-12-12 at 57de4e699a)
169
+ + ref-filter: add support to display trailers as part of contents
170
+ + pretty: add %(trailers) format for displaying trailers of a commit message
171
+ (this branch uses jt/use-trailer-api-in-commands.)
172
164
- "git merge --continue" has been added as a synonym to "git commit"
165
- to conclude a merge that has stopped due to conflicts.
173
+ In addition to %(subject), %(body), "log --pretty=format:..."
174
+ learned a new placeholder %(trailers).
175
167
- Will merge to 'next'.
176
177
+* jk/xdiff-drop-xdl-fast-hash (2016-12-06) 1 commit
178
+ (merged to 'next' on 2016-12-13 at 914e306217)
179
+ + xdiff: drop XDL_FAST_HASH
180
170
-* jk/make-tags-find-sources-tweak (2016-12-14) 4 commits
171
- (merged to 'next' on 2016-12-16 at 06d0b0fbfd)
172
- + Makefile: exclude contrib from FIND_SOURCE_FILES
173
- + Makefile: match shell scripts in FIND_SOURCE_FILES
174
- + Makefile: exclude test cruft from FIND_SOURCE_FILES
175
- + Makefile: reformat FIND_SOURCE_FILES
181
+ Retire the "fast hash" that had disastrous performance issues in
182
+ some corner cases.
183
177
- Update the procedure to generate "tags" for developer support.
184
179
- Will merge to 'master'.
185
+* js/normalize-path-copy-ceil (2016-12-16) 1 commit
186
+ (merged to 'next' on 2016-12-16 at 634ba4debc)
187
+ + normalize_path_copy(): fix pushing to //server/share/dir on Windows
188
189
+ A pathname that begins with "//" or "\\" on Windows is special but
190
+ path normalization logic was unaware of it.
191
182
-* jk/parseopt-usage-msg-opt (2016-12-14) 1 commit
183
- - parse-options: print "fatal:" before usage_msg_opt()
192
185
- The function usage_msg_opt() has been updated to say "fatal:"
186
- before the custom message programs give, when they want to die
187
- with a message about wrong command line options followed by the
188
- standard usage string.
193
+* jt/use-trailer-api-in-commands (2016-11-29) 5 commits
194
+ (merged to 'next' on 2016-12-12 at da1f140ad4)
195
+ + sequencer: use trailer's trailer layout
196
+ + trailer: have function to describe trailer layout
197
+ + trailer: avoid unnecessary splitting on lines
198
+ + commit: make ignore_non_trailer take buf/len
199
+ + trailer: be stricter in parsing separators
200
+ (this branch is used by jk/trailers-placeholder-in-pretty.)
201
190
- Will merge to 'next'.
202
+ Commands that operate on a log message and add lines to the trailer
203
+ blocks, such as "format-patch -s", "cherry-pick (-x|-s)", and
204
+ "commit -s", have been taught to use the logic of and share the
205
+ code with "git interpret-trailer".
206
207
193
-* ld/p4-compare-dir-vs-symlink (2016-12-14) 1 commit
194
- - git-p4: avoid crash adding symlinked directory
208
+* kh/tutorial-grammofix (2016-12-09) 4 commits
209
+ (merged to 'next' on 2016-12-13 at a951db78bc)
210
+ + doc: omit needless "for"
211
+ + doc: make the intent of sentence clearer
212
+ + doc: add verb in front of command to run
213
+ + doc: add articles (grammar)
214
196
- "git p4" misbehaved when swapping a directory and a symbolic link.
215
198
- Will merge to 'next'.
216
+* ld/p4-worktree (2016-12-13) 1 commit
217
+ (merged to 'next' on 2016-12-16 at 5210ab9973)
218
+ + git-p4: support git worktrees
219
220
+ "git p4" didn't interact with the internal of .git directory
221
+ correctly in the modern "git-worktree"-enabled world.
222
201
-* js/prepare-sequencer-more (2016-12-14) 34 commits
202
- - sequencer (rebase -i): write out the final message
203
- - sequencer (rebase -i): write the progress into files
204
- - sequencer (rebase -i): show the progress
205
- - sequencer (rebase -i): suggest --edit-todo upon unknown command
206
- - sequencer (rebase -i): show only failed cherry-picks' output
207
- - sequencer (rebase -i): show only failed `git commit`'s output
208
- - run_command_opt(): optionally hide stderr when the command succeeds
209
- - sequencer (rebase -i): differentiate between comments and 'noop'
210
- - sequencer (rebase -i): implement the 'drop' command
211
- - sequencer (rebase -i): allow rescheduling commands
212
- - sequencer (rebase -i): respect strategy/strategy_opts settings
213
- - sequencer (rebase -i): respect the rebase.autostash setting
214
- - sequencer (rebase -i): run the post-rewrite hook, if needed
215
- - sequencer (rebase -i): record interrupted commits in rewritten, too
216
- - sequencer (rebase -i): copy commit notes at end
217
- - sequencer (rebase -i): set the reflog message consistently
218
- - sequencer (rebase -i): refactor setting the reflog message
219
- - sequencer (rebase -i): allow fast-forwarding for edit/reword
220
- - sequencer (rebase -i): implement the 'reword' command
221
- - sequencer (rebase -i): leave a patch upon error
222
- - sequencer (rebase -i): update refs after a successful rebase
223
- - sequencer (rebase -i): the todo can be empty when continuing
224
- - sequencer (rebase -i): skip some revert/cherry-pick specific code path
225
- - sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer needed
226
- - sequencer (rebase -i): allow continuing with staged changes
227
- - sequencer (rebase -i): write an author-script file
228
- - sequencer (rebase -i): implement the short commands
229
- - sequencer (rebase -i): add support for the 'fixup' and 'squash' commands
230
- - sequencer (rebase -i): write the 'done' file
231
- - sequencer (rebase -i): learn about the 'verbose' mode
232
- - sequencer (rebase -i): implement the 'exec' command
233
- - sequencer (rebase -i): implement the 'edit' command
234
- - sequencer (rebase -i): implement the 'noop' command
235
- - sequencer: support a new action: 'interactive rebase'
223
237
- The sequencer has further been extended in preparation to act as a
238
- back-end for "rebase -i".
224
+* lr/doc-fix-cet (2016-12-12) 1 commit
225
+ (merged to 'next' on 2016-12-13 at dbc9e07e57)
226
+ + date-formats.txt: Typo fix
227
+
228
+
229
+* ls/t0021-fixup (2016-12-05) 1 commit
230
+ (merged to 'next' on 2016-12-12 at db652e691a)
231
+ + t0021: minor filter process test cleanup
232
+
233
+
234
+* ls/travis-update-p4-and-lfs (2016-12-05) 1 commit
235
+ (merged to 'next' on 2016-12-12 at 5496caa048)
236
+ + travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux build
237
+
238
+ The default Travis-CI configuration specifies newer P4 and GitLFS.
239
+
240
+
241
+* nd/for-each-ref-ignore-case (2016-12-05) 1 commit
242
+ (merged to 'next' on 2016-12-12 at 527cc4f275)
243
+ + tag, branch, for-each-ref: add --ignore-case for sorting and filtering
244
+
245
+ "git branch --list" and friends learned "--ignore-case" option to
246
+ optionally sort branches and tags case insensitively.
247
+
248
+
249
+* nd/rebase-forget (2016-12-11) 1 commit
250
+ (merged to 'next' on 2016-12-12 at 50b5d28af4)
251
+ + rebase: add --quit to cleanup rebase, leave everything else untouched
252
+
253
+ "git rebase" learned "--quit" option, which allows a user to
254
+ remove the metadata left by an earlier "git rebase" that was
255
+ manually aborted without using "git rebase --abort".
256
+
257
+
258
+* rj/git-version-gen-do-not-force-abbrev (2016-12-06) 1 commit
259
+ (merged to 'next' on 2016-12-12 at e37970c3f5)
260
+ + GIT-VERSION-GEN: do not force abbreviation length used by 'describe'
261
+
262
+ A minor build update.
263
+
264
+
265
+* sb/t3600-cleanup (2016-12-12) 2 commits
266
+ (merged to 'next' on 2016-12-13 at e06e6e702f)
267
+ + t3600: slightly modernize style
268
+ (merged to 'next' on 2016-12-12 at d9996af5e8)
269
+ + t3600: remove useless redirect
270
+
271
+ Code cleanup.
272
240
- Waiting for review.
273
274
+* sb/unpack-trees-grammofix (2016-12-05) 1 commit
275
+ (merged to 'next' on 2016-12-12 at 29e536f590)
276
+ + unpack-trees: fix grammar for untracked files in directories
277
243
-* jk/index-pack-wo-repo-from-stdin (2016-12-16) 4 commits
244
- - index-pack: skip collision check when not in repository
245
- - t: use nongit() function where applicable
246
- - index-pack: complain when --stdin is used outside of a repo
247
- - t5000: extract nongit function to test-lib-functions.sh
278
+--------------------------------------------------
279
+[New Topics]
280
249
- "git index-pack --stdin" needs an access to an existing repository,
250
- but "git index-pack file.pack" to generate an .idx file that
251
- corresponds to a packfile does not.
281
+* gv/p4-multi-path-commit-fix (2016-12-19) 1 commit
282
+ - git-p4: fix multi-path changelist empty commits
283
+
284
+ "git p4" that tracks multile p4 paths imported a single changelist
285
+ that touches files in these multiple paths as one commit, followed
286
+ by many empty commits. This has been fixed.
287
288
Will merge to 'next'.
289
290
256
-* jk/readme-gmane-is-no-more (2016-12-15) 1 commit
257
- (merged to 'next' on 2016-12-16 at 44ad5c5205)
258
- + README: replace gmane link with public-inbox
291
+* js/mingw-isatty (2016-12-18) 1 commit
292
+ - winansi_isatty(): fix when Git is used from CMD
293
260
- Will merge to 'master'.
294
+ Update the isatty() emulation for Windows to make it interact
295
+ better with the cmd.exe console.
296
297
+ Waiting for an ack.
298
263
-* lt/shortlog-by-committer (2016-12-16) 2 commits
264
- - shortlog: test and document --committer option
265
- - shortlog: group by committer information
299
267
- "git shortlog" learned "--committer" option to group commits by
268
- committer, instead of author.
300
+* jt/mailinfo-fold-in-body-headers (2016-12-19) 1 commit
301
+ - mailinfo.c: move side-effects outside of assert
302
+
303
+ Fix for NDEBUG builds.
304
+
305
+ Will merge to 'next'.
306
+
307
+
308
+* ls/p4-lfs (2016-12-18) 1 commit
309
+ - git-p4: add diff/merge properties to .gitattributes for GitLFS files
310
+
311
+ Update GitLFS integration with "git p4".
312
+
313
+ Waiting for an ack.
314
+
315
+
316
+* ls/p4-path-encoding (2016-12-18) 1 commit
317
+ - git-p4: fix git-p4.pathEncoding for removed files
318
+
319
+ When "git p4" imports changelist that removes paths, it failed to
320
+ convert pathnames when the p4 used encoding different from the one
321
+ used on the Git side. This has been corrected.
322
+
323
+ Waiting for an ack.
324
+
325
+
326
+* mh/fast-import-notes-fix-new (2016-12-19) 1 commit
327
+ - fast-import: properly fanout notes when tree is imported
328
+
329
+ "git fast-import" sometimes mishandled while rebalancing notes
330
+ tree, which has been fixed.
331
332
Will merge to 'next'.
333
@@ -408,343 +470,229 @@ of the repositories listed at
470
--------------------------------------------------
471
[Cooking]
472
411
-* bw/realpath-wo-chdir (2016-12-12) 4 commits
412
- - real_path: have callers use real_pathdup and strbuf_realpath
413
- - real_path: create real_pathdup
414
- - real_path: convert real_path_internal to strbuf_realpath
415
- - real_path: resolve symlinks by hand
416
- (this branch is used by bw/grep-recurse-submodules.)
417
-
418
- The implementation of "real_path()" was to go there with chdir(2)
419
- and call getcwd(3), but this obviously wouldn't be usable in a
420
- threaded environment. Rewrite it to manually resolve relative
421
- paths including symbolic links in path components.
422
-
423
- Will merge to 'next'.
424
-
425
-
426
-* jk/quote-env-path-list-component (2016-12-13) 4 commits
427
- (merged to 'next' on 2016-12-16 at d2cd6008b9)
428
- + t5547-push-quarantine: run the path separator test on Windows, too
429
- + tmp-objdir: quote paths we add to alternates
430
- + alternates: accept double-quoted paths
431
- + Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component
432
-
433
- A recent update to receive-pack to make it easier to drop garbage
434
- objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot
435
- have a pathname with a colon in it (no surprise!), and this in turn
436
- made it impossible to push into a repository at such a path. This
437
- has been fixed by introducing a quoting mechanism used when
438
- appending such a path to the colon-separated list.
439
-
440
- Will merge to 'master'.
441
-
442
-
443
-* js/normalize-path-copy-ceil (2016-12-16) 1 commit
444
- (merged to 'next' on 2016-12-16 at 634ba4debc)
445
- + normalize_path_copy(): fix pushing to //server/share/dir on Windows
446
-
447
- A pathname that begins with "//" or "\\" on Windows is special but
448
- path normalization logic was unaware of it.
449
-
450
- Will merge to 'master'.
451
-
452
-
453
-* jc/lock-report-on-error (2016-12-07) 3 commits
454
- (merged to 'next' on 2016-12-13 at cb6c07ee92)
455
- + lockfile: LOCK_REPORT_ON_ERROR
456
- + hold_locked_index(): align error handling with hold_lockfile_for_update()
457
- + wt-status: implement opportunisitc index update correctly
458
-
459
- Git 2.11 had a minor regression in "merge --ff-only" that competed
460
- with another process that simultanously attempted to update the
461
- index. We used to explain what went wrong with an error message,
462
- but the new code silently failed. This resurrects the error
463
- message.
464
-
465
- Will merge to 'master'.
466
-
467
-
468
-* nd/shallow-fixup (2016-12-07) 6 commits
469
- (merged to 'next' on 2016-12-13 at 1a3edb8bce)
470
- + shallow.c: remove useless code
471
- + shallow.c: bit manipulation tweaks
472
- + shallow.c: avoid theoretical pointer wrap-around
473
- + shallow.c: make paint_alloc slightly more robust
474
- + shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools
475
- + shallow.c: rename fields in paint_info to better express their purposes
476
-
477
- Code cleanup in shallow boundary computation.
478
-
479
- Will merge to 'master'.
480
-
481
-
482
-* sb/sequencer-abort-safety (2016-12-14) 6 commits
483
- (merged to 'next' on 2016-12-16 at ec71fb1217)
484
- + Revert "sequencer: remove useless get_dir() function"
485
- (merged to 'next' on 2016-12-13 at 6107e43d65)
486
- + sequencer: remove useless get_dir() function
487
- + sequencer: make sequencer abort safer
488
- + t3510: test that cherry-pick --abort does not unsafely change HEAD
489
- + am: change safe_to_abort()'s not rewinding error into a warning
490
- + am: fix filename in safe_to_abort() error message
491
-
492
- Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back
493
- to where cherry-pick started while picking multiple changes, when
494
- the cherry-pick stopped to ask for help from the user, and the user
495
- did "git reset --hard" to a different commit in order to re-attempt
496
- the operation.
497
-
498
- Will merge to 'master'.
499
-
500
-
501
-* kh/tutorial-grammofix (2016-12-09) 4 commits
502
- (merged to 'next' on 2016-12-13 at a951db78bc)
503
- + doc: omit needless "for"
504
- + doc: make the intent of sentence clearer
505
- + doc: add verb in front of command to run
506
- + doc: add articles (grammar)
507
-
508
- Will merge to 'master'.
509
-
510
-
511
-* da/mergetool-xxdiff-hotkey (2016-12-11) 1 commit
512
- (merged to 'next' on 2016-12-13 at a08f375c81)
513
- + mergetools: fix xxdiff hotkeys
514
-
515
- The way to specify hotkeys to "xxdiff" that is used by "git
516
- mergetool" has been modernized to match recent versions of xxdiff.
517
-
518
- Will merge to 'master'.
519
-
520
-
521
-* jk/difftool-in-subdir (2016-12-11) 4 commits
522
- - difftool: rename variables for consistency
523
- - difftool: chdir as early as possible
524
- - difftool: sanitize $workdir as early as possible
525
- - difftool: fix dir-diff index creation when in a subdirectory
526
-
527
- Even though an fix was attempted in Git 2.9.3 days, but running
528
- "git difftool --dir-diff" from a subdirectory never worked. This
529
- has been fixed.
530
-
531
- Will merge to 'next'.
532
-
533
-
534
-* lr/doc-fix-cet (2016-12-12) 1 commit
535
- (merged to 'next' on 2016-12-13 at dbc9e07e57)
536
- + date-formats.txt: Typo fix
537
-
538
- Will merge to 'master'.
539
-
540
-
541
-* vs/submodule-clone-nested-submodules-alternates (2016-12-12) 1 commit
542
- (merged to 'next' on 2016-12-13 at 8a317ab745)
543
- + submodule--helper: set alternateLocation for cloned submodules
544
-
545
- "git clone --reference $there --recurse-submodules $super" has been
546
- taught to guess repositories usable as references for submodules of
547
- $super that are embedded in $there while making a clone of the
548
- superproject borrow objects from $there; extend the mechanism to
549
- also allow submodules of these submodules to borrow repositories
550
- embedded in these clones of the submodules embedded in the clone of
551
- the superproject.
552
-
553
- Will merge to 'master'.
554
-
555
-
556
-* jb/diff-no-index-no-abbrev (2016-12-08) 1 commit
557
- (merged to 'next' on 2016-12-12 at 959981ef50)
558
- + diff: handle --no-abbrev in no-index case
559
-
560
- "git diff --no-index" did not take "--no-abbrev" option.
561
-
562
- Will merge to 'master'.
563
-
564
-
565
-* jk/http-walker-limit-redirect-2.9 (2016-12-06) 5 commits
566
- (merged to 'next' on 2016-12-12 at 3e4bcd7bca)
567
- + http: treat http-alternates like redirects
568
- + http: make redirects more obvious
569
- + remote-curl: rename shadowed options variable
570
- + http: always update the base URL for redirects
571
- + http: simplify update_url_from_redirect
572
- (this branch is used by bw/transport-protocol-policy and jk/http-walker-limit-redirect.)
573
-
574
- Transport with dumb http can be fooled into following foreign URLs
575
- that the end user does not intend to, especially with the server
576
- side redirects and http-alternates mechanism, which can lead to
577
- security issues. Tighten the redirection and make it more obvious
578
- to the end user when it happens.
579
-
580
- Will merge to 'master'.
581
-
582
-
583
-* jk/http-walker-limit-redirect (2016-12-06) 2 commits
584
- (merged to 'next' on 2016-12-12 at 8b58025e3a)
585
- + http-walker: complain about non-404 loose object errors
586
- + Merge branch 'ew/http-walker' into jk/http-walker-limit-redirect
587
- (this branch is used by bw/transport-protocol-policy; uses jk/http-walker-limit-redirect-2.9.)
588
-
589
- Update the error messages from the dumb-http client when it fails
590
- to obtain loose objects; we used to give sensible error message
591
- only upon 404 but we now forbid unexpected redirects that needs to
592
- be reported with something sensible.
593
-
594
- Will merge to 'master'.
595
-
596
-
597
-* ah/grammos (2016-12-05) 3 commits
598
- (merged to 'next' on 2016-12-12 at 13ad487b28)
599
- + clone,fetch: explain the shallow-clone option a little more clearly
600
- + receive-pack: improve English grammar of denyCurrentBranch message
601
- + bisect: improve English grammar of not-ancestors message
602
-
603
- A few messages have been fixed for their grammatical errors.
604
-
605
- Will merge to 'master'.
606
-
607
-
608
-* ak/commit-only-allow-empty (2016-12-09) 2 commits
609
- (merged to 'next' on 2016-12-12 at 54188ab23c)
610
- + commit: remove 'Clever' message for --only --amend
611
- + commit: make --only --allow-empty work without paths
473
+* bw/pathspec-cleanup (2016-12-14) 16 commits
474
+ - pathspec: rename prefix_pathspec to init_pathspec_item
475
+ - pathspec: small readability changes
476
+ - pathspec: create strip submodule slash helpers
477
+ - pathspec: create parse_element_magic helper
478
+ - pathspec: create parse_long_magic function
479
+ - pathspec: create parse_short_magic function
480
+ - pathspec: factor global magic into its own function
481
+ - pathspec: simpler logic to prefix original pathspec elements
482
+ - pathspec: always show mnemonic and name in unsupported_magic
483
+ - pathspec: remove unused variable from unsupported_magic
484
+ - pathspec: copy and free owned memory
485
+ - pathspec: remove the deprecated get_pathspec function
486
+ - ls-tree: convert show_recursive to use the pathspec struct interface
487
+ - dir: convert fill_directory to use the pathspec struct interface
488
+ - dir: remove struct path_simplify
489
+ - mv: remove use of deprecated 'get_pathspec()'
490
613
- "git commit --allow-empty --only" (no pathspec) with dirty index
614
- ought to be an acceptable way to create a new commit that does not
615
- change any paths, but it was forbidden (perhaps because nobody
616
- needed it).
491
+ Code clean-up in the pathspec API.
492
618
- Will merge to 'master'.
493
+ Waiting for the (hopefully) final round of review before 'next'.
494
495
621
-* bb/unicode-9.0 (2016-12-14) 6 commits
622
- (merged to 'next' on 2016-12-16 at be2531431a)
623
- + unicode_width.h: update the width tables to Unicode 9.0
624
- + update_unicode.sh: remove the plane filter
625
- + update_unicode.sh: automatically download newer definition files
626
- + update_unicode.sh: pin the uniset repo to a known good commit
627
- + update_unicode.sh: remove an unnecessary subshell level
628
- + update_unicode.sh: move it into contrib/update-unicode
496
+* cp/merge-continue (2016-12-15) 4 commits
497
+ (merged to 'next' on 2016-12-19 at 8ba0094f45)
498
+ + merge: mark usage error strings for translation
499
+ + merge: ensure '--abort' option takes no arguments
500
+ + completion: add --continue option for merge
501
+ + merge: add '--continue' option as a synonym for 'git commit'
502
630
- The character width table has been updated to match Unicode 9.0
503
+ "git merge --continue" has been added as a synonym to "git commit"
504
+ to conclude a merge that has stopped due to conflicts.
505
506
Will merge to 'master'.
507
508
635
-* ld/p4-worktree (2016-12-13) 1 commit
636
- (merged to 'next' on 2016-12-16 at 5210ab9973)
637
- + git-p4: support git worktrees
509
+* jk/parseopt-usage-msg-opt (2016-12-14) 1 commit
510
+ (merged to 'next' on 2016-12-19 at c488c7c6e1)
511
+ + parse-options: print "fatal:" before usage_msg_opt()
512
639
- "git p4" didn't interact with the internal of .git directory
640
- correctly in the modern "git-worktree"-enabled world.
513
+ The function usage_msg_opt() has been updated to say "fatal:"
514
+ before the custom message programs give, when they want to die
515
+ with a message about wrong command line options followed by the
516
+ standard usage string.
517
518
Will merge to 'master'.
519
520
645
-* ls/t0021-fixup (2016-12-05) 1 commit
646
- (merged to 'next' on 2016-12-12 at db652e691a)
647
- + t0021: minor filter process test cleanup
521
+* ld/p4-compare-dir-vs-symlink (2016-12-18) 1 commit
522
+ - git-p4: avoid crash adding symlinked directory
523
649
- Will merge to 'master'.
524
+ "git p4" misbehaved when swapping a directory and a symbolic link.
525
526
+ Will merge to 'next'.
527
652
-* ls/travis-update-p4-and-lfs (2016-12-05) 1 commit
653
- (merged to 'next' on 2016-12-12 at 5496caa048)
654
- + travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux build
528
656
- The default Travis-CI configuration specifies newer P4 and GitLFS.
529
+* js/prepare-sequencer-more (2016-12-14) 34 commits
530
+ - sequencer (rebase -i): write out the final message
531
+ - sequencer (rebase -i): write the progress into files
532
+ - sequencer (rebase -i): show the progress
533
+ - sequencer (rebase -i): suggest --edit-todo upon unknown command
534
+ - sequencer (rebase -i): show only failed cherry-picks' output
535
+ - sequencer (rebase -i): show only failed `git commit`'s output
536
+ - run_command_opt(): optionally hide stderr when the command succeeds
537
+ - sequencer (rebase -i): differentiate between comments and 'noop'
538
+ - sequencer (rebase -i): implement the 'drop' command
539
+ - sequencer (rebase -i): allow rescheduling commands
540
+ - sequencer (rebase -i): respect strategy/strategy_opts settings
541
+ - sequencer (rebase -i): respect the rebase.autostash setting
542
+ - sequencer (rebase -i): run the post-rewrite hook, if needed
543
+ - sequencer (rebase -i): record interrupted commits in rewritten, too
544
+ - sequencer (rebase -i): copy commit notes at end
545
+ - sequencer (rebase -i): set the reflog message consistently
546
+ - sequencer (rebase -i): refactor setting the reflog message
547
+ - sequencer (rebase -i): allow fast-forwarding for edit/reword
548
+ - sequencer (rebase -i): implement the 'reword' command
549
+ - sequencer (rebase -i): leave a patch upon error
550
+ - sequencer (rebase -i): update refs after a successful rebase
551
+ - sequencer (rebase -i): the todo can be empty when continuing
552
+ - sequencer (rebase -i): skip some revert/cherry-pick specific code path
553
+ - sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer needed
554
+ - sequencer (rebase -i): allow continuing with staged changes
555
+ - sequencer (rebase -i): write an author-script file
556
+ - sequencer (rebase -i): implement the short commands
557
+ - sequencer (rebase -i): add support for the 'fixup' and 'squash' commands
558
+ - sequencer (rebase -i): write the 'done' file
559
+ - sequencer (rebase -i): learn about the 'verbose' mode
560
+ - sequencer (rebase -i): implement the 'exec' command
561
+ - sequencer (rebase -i): implement the 'edit' command
562
+ - sequencer (rebase -i): implement the 'noop' command
563
+ - sequencer: support a new action: 'interactive rebase'
564
658
- Will merge to 'master'.
565
+ The sequencer has further been extended in preparation to act as a
566
+ back-end for "rebase -i".
567
568
+ Waiting for review.
569
661
-* sb/t3600-cleanup (2016-12-12) 2 commits
662
- (merged to 'next' on 2016-12-13 at e06e6e702f)
663
- + t3600: slightly modernize style
664
- (merged to 'next' on 2016-12-12 at d9996af5e8)
665
- + t3600: remove useless redirect
570
667
- Code cleanup.
571
+* jk/index-pack-wo-repo-from-stdin (2016-12-16) 4 commits
572
+ (merged to 'next' on 2016-12-19 at 9a88221347)
573
+ + index-pack: skip collision check when not in repository
574
+ + t: use nongit() function where applicable
575
+ + index-pack: complain when --stdin is used outside of a repo
576
+ + t5000: extract nongit function to test-lib-functions.sh
577
+
578
+ "git index-pack --stdin" needs an access to an existing repository,
579
+ but "git index-pack file.pack" to generate an .idx file that
580
+ corresponds to a packfile does not.
581
582
Will merge to 'master'.
583
584
672
-* sb/unpack-trees-grammofix (2016-12-05) 1 commit
673
- (merged to 'next' on 2016-12-12 at 29e536f590)
674
- + unpack-trees: fix grammar for untracked files in directories
585
+* lt/shortlog-by-committer (2016-12-16) 2 commits
586
+ (merged to 'next' on 2016-12-19 at 555976fc0a)
587
+ + shortlog: test and document --committer option
588
+ + shortlog: group by committer information
589
+
590
+ "git shortlog" learned "--committer" option to group commits by
591
+ committer, instead of author.
592
593
Will merge to 'master'.
594
595
679
-* da/difftool-dir-diff-fix (2016-12-08) 1 commit
680
- (merged to 'next' on 2016-12-12 at fd31a92ad6)
681
- + difftool: fix dir-diff index creation when in a subdirectory
596
+* bw/realpath-wo-chdir (2016-12-12) 4 commits
597
+ - real_path: have callers use real_pathdup and strbuf_realpath
598
+ - real_path: create real_pathdup
599
+ - real_path: convert real_path_internal to strbuf_realpath
600
+ - real_path: resolve symlinks by hand
601
+ (this branch is used by bw/grep-recurse-submodules.)
602
683
- "git difftool --dir-diff" had a minor regression when started from
684
- a subdirectory, which has been fixed.
603
+ The implementation of "real_path()" was to go there with chdir(2)
604
+ and call getcwd(3), but this obviously wouldn't be usable in a
605
+ threaded environment. Rewrite it to manually resolve relative
606
+ paths including symbolic links in path components.
607
686
- Will merge to 'master'.
608
+ Will merge to 'next'.
609
610
689
-* jk/stash-disable-renames-internally (2016-12-06) 1 commit
690
- (merged to 'next' on 2016-12-12 at e2b97aae68)
691
- + stash: prefer plumbing over git-diff
611
+* jk/quote-env-path-list-component (2016-12-13) 4 commits
612
+ (merged to 'next' on 2016-12-16 at d2cd6008b9)
613
+ + t5547-push-quarantine: run the path separator test on Windows, too
614
+ + tmp-objdir: quote paths we add to alternates
615
+ + alternates: accept double-quoted paths
616
+ + Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component
617
693
- When diff.renames configuration is on (and with Git 2.9 and later,
694
- it is enabled by default, which made it worse), "git stash"
695
- misbehaved if a file is removed and another file with a very
696
- similar content is added.
618
+ A recent update to receive-pack to make it easier to drop garbage
619
+ objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot
620
+ have a pathname with a colon in it (no surprise!), and this in turn
621
+ made it impossible to push into a repository at such a path. This
622
+ has been fixed by introducing a quoting mechanism used when
623
+ appending such a path to the colon-separated list.
624
625
Will merge to 'master'.
626
627
701
-* jk/xdiff-drop-xdl-fast-hash (2016-12-06) 1 commit
702
- (merged to 'next' on 2016-12-13 at 914e306217)
703
- + xdiff: drop XDL_FAST_HASH
628
+* nd/shallow-fixup (2016-12-07) 6 commits
629
+ (merged to 'next' on 2016-12-13 at 1a3edb8bce)
630
+ + shallow.c: remove useless code
631
+ + shallow.c: bit manipulation tweaks
632
+ + shallow.c: avoid theoretical pointer wrap-around
633
+ + shallow.c: make paint_alloc slightly more robust
634
+ + shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools
635
+ + shallow.c: rename fields in paint_info to better express their purposes
636
705
- Retire the "fast hash" that had disastrous performance issues in
706
- some corner cases.
637
+ Code cleanup in shallow boundary computation.
638
639
Will merge to 'master'.
640
641
711
-* ls/filter-process (2016-12-06) 1 commit
712
- (merged to 'next' on 2016-12-12 at 8ed1f9eb02)
713
- + docs: warn about possible '=' in clean/smudge filter process values
642
+* sb/sequencer-abort-safety (2016-12-14) 6 commits
643
+ (merged to 'next' on 2016-12-16 at ec71fb1217)
644
+ + Revert "sequencer: remove useless get_dir() function"
645
+ (merged to 'next' on 2016-12-13 at 6107e43d65)
646
+ + sequencer: remove useless get_dir() function
647
+ + sequencer: make sequencer abort safer
648
+ + t3510: test that cherry-pick --abort does not unsafely change HEAD
649
+ + am: change safe_to_abort()'s not rewinding error into a warning
650
+ + am: fix filename in safe_to_abort() error message
651
715
- Doc update.
652
+ Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back
653
+ to where cherry-pick started while picking multiple changes, when
654
+ the cherry-pick stopped to ask for help from the user, and the user
655
+ did "git reset --hard" to a different commit in order to re-attempt
656
+ the operation.
657
658
Will merge to 'master'.
659
660
720
-* nd/for-each-ref-ignore-case (2016-12-05) 1 commit
721
- (merged to 'next' on 2016-12-12 at 527cc4f275)
722
- + tag, branch, for-each-ref: add --ignore-case for sorting and filtering
661
+* jk/difftool-in-subdir (2016-12-11) 4 commits
662
+ - difftool: rename variables for consistency
663
+ - difftool: chdir as early as possible
664
+ - difftool: sanitize $workdir as early as possible
665
+ - difftool: fix dir-diff index creation when in a subdirectory
666
724
- "git branch --list" and friends learned "--ignore-case" option to
725
- optionally sort branches and tags case insensitively.
667
+ Even though an fix was attempted in Git 2.9.3 days, but running
668
+ "git difftool --dir-diff" from a subdirectory never worked. This
669
+ has been fixed.
670
727
- Will merge to 'master'.
671
+ Will merge to 'next'.
672
673
730
-* rj/git-version-gen-do-not-force-abbrev (2016-12-06) 1 commit
731
- (merged to 'next' on 2016-12-12 at e37970c3f5)
732
- + GIT-VERSION-GEN: do not force abbreviation length used by 'describe'
674
+* vs/submodule-clone-nested-submodules-alternates (2016-12-12) 1 commit
675
+ (merged to 'next' on 2016-12-13 at 8a317ab745)
676
+ + submodule--helper: set alternateLocation for cloned submodules
677
734
- A minor build update.
678
+ "git clone --reference $there --recurse-submodules $super" has been
679
+ taught to guess repositories usable as references for submodules of
680
+ $super that are embedded in $there while making a clone of the
681
+ superproject borrow objects from $there; extend the mechanism to
682
+ also allow submodules of these submodules to borrow repositories
683
+ embedded in these clones of the submodules embedded in the clone of
684
+ the superproject.
685
686
Will merge to 'master'.
687
688
739
-* jc/renormalize-merge-kill-safer-crlf (2016-12-01) 4 commits
740
- (merged to 'next' on 2016-12-12 at 041b834f81)
741
- + convert: git cherry-pick -Xrenormalize did not work
742
- + Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf
743
- + merge-recursive: handle NULL in add_cacheinfo() correctly
744
- + cherry-pick: demonstrate a segmentation fault
689
+* ls/filter-process (2016-12-18) 2 commits
690
+ (merged to 'next' on 2016-12-19 at 5ed29656db)
691
+ + t0021: fix flaky test
692
+ (merged to 'next' on 2016-12-12 at 8ed1f9eb02)
693
+ + docs: warn about possible '=' in clean/smudge filter process values
694
746
- Fix a corner case in merge-recursive regression that crept in
747
- during 2.10 development cycle.
695
+ Doc update.
696
697
Will merge to 'master'.
698
@@ -769,18 +717,6 @@ of the repositories listed at
717
Will cook in 'next'.
718
719
772
-* jk/trailers-placeholder-in-pretty (2016-12-11) 2 commits
773
- (merged to 'next' on 2016-12-12 at 57de4e699a)
774
- + ref-filter: add support to display trailers as part of contents
775
- + pretty: add %(trailers) format for displaying trailers of a commit message
776
- (this branch uses jt/use-trailer-api-in-commands.)
777
-
778
- In addition to %(subject), %(body), "log --pretty=format:..."
779
- learned a new placeholder %(trailers).
780
-
781
- Will merge to 'master'.
782
-
783
-
720
* sb/submodule-embed-gitdir (2016-12-12) 6 commits
721
- submodule: add absorb-git-dir function
722
- move connect_work_tree_and_git_dir to dir.h
@@ -896,19 +832,19 @@ of the repositories listed at
832
833
834
* bw/transport-protocol-policy (2016-12-15) 6 commits
899
- - http: respect protocol.*.allow=user for http-alternates
900
- - transport: add from_user parameter to is_transport_allowed
901
- - http: create function to get curl allowed protocols
902
- - transport: add protocol policy config option
903
- - http: always warn if libcurl version is too old
904
- - lib-proto-disable: variable name fix
905
- (this branch uses jk/http-walker-limit-redirect and jk/http-walker-limit-redirect-2.9.)
835
+ (merged to 'next' on 2016-12-19 at 166168205c)
836
+ + http: respect protocol.*.allow=user for http-alternates
837
+ + transport: add from_user parameter to is_transport_allowed
838
+ + http: create function to get curl allowed protocols
839
+ + transport: add protocol policy config option
840
+ + http: always warn if libcurl version is too old
841
+ + lib-proto-disable: variable name fix
842
843
Finer-grained control of what protocols are allowed for transports
844
during clone/fetch/push have been enabled via a new configuration
845
mechanism.
846
911
- Will merge to 'next'.
847
+ Will merge to 'master'.
848
849
850
* jt/fetch-no-redundant-tag-fetch-map (2016-11-11) 1 commit
@@ -950,34 +886,6 @@ of the repositories listed at
886
Will cook in 'next'.
887
888
953
-* jt/use-trailer-api-in-commands (2016-11-29) 5 commits
954
- (merged to 'next' on 2016-12-12 at da1f140ad4)
955
- + sequencer: use trailer's trailer layout
956
- + trailer: have function to describe trailer layout
957
- + trailer: avoid unnecessary splitting on lines
958
- + commit: make ignore_non_trailer take buf/len
959
- + trailer: be stricter in parsing separators
960
- (this branch is used by jk/trailers-placeholder-in-pretty.)
961
-
962
- Commands that operate on a log message and add lines to the trailer
963
- blocks, such as "format-patch -s", "cherry-pick (-x|-s)", and
964
- "commit -s", have been taught to use the logic of and share the
965
- code with "git interpret-trailer".
966
-
967
- Will merge to 'master'.
968
-
969
-
970
-* nd/rebase-forget (2016-12-11) 1 commit
971
- (merged to 'next' on 2016-12-12 at 50b5d28af4)
972
- + rebase: add --quit to cleanup rebase, leave everything else untouched
973
-
974
- "git rebase" learned "--forget" option, which allows a user to
975
- remove the metadata left by an earlier "git rebase" that was
976
- manually aborted without using "git rebase --abort".
977
-
978
- Will merge to 'master'.
979
-
980
-
889
* jc/git-open-cloexec (2016-11-02) 3 commits
890
- sha1_file: stop opening files with O_NOATIME
891
- git_open_cloexec(): use fcntl(2) w/ FD_CLOEXEC fallback
@@ -1146,26 +1054,27 @@ of the repositories listed at
1054
1055
1056
* va/i18n-perl-scripts (2016-12-14) 16 commits
1149
- - i18n: difftool: mark warnings for translation
1150
- - i18n: send-email: mark composing message for translation
1151
- - i18n: send-email: mark string with interpolation for translation
1152
- - i18n: send-email: mark warnings and errors for translation
1153
- - i18n: send-email: mark strings for translation
1154
- - i18n: add--interactive: mark status words for translation
1155
- - i18n: add--interactive: remove %patch_modes entries
1156
- - i18n: add--interactive: mark edit_hunk_manually message for translation
1157
- - i18n: add--interactive: i18n of help_patch_cmd
1158
- - i18n: add--interactive: mark patch prompt for translation
1159
- - i18n: add--interactive: mark plural strings
1160
- - i18n: clean.c: match string with git-add--interactive.perl
1161
- - i18n: add--interactive: mark strings with interpolation for translation
1162
- - i18n: add--interactive: mark simple here-documents for translation
1163
- - i18n: add--interactive: mark strings for translation
1164
- - Git.pm: add subroutines for commenting lines
1057
+ (merged to 'next' on 2016-12-19 at ec800aba9f)
1058
+ + i18n: difftool: mark warnings for translation
1059
+ + i18n: send-email: mark composing message for translation
1060
+ + i18n: send-email: mark string with interpolation for translation
1061
+ + i18n: send-email: mark warnings and errors for translation
1062
+ + i18n: send-email: mark strings for translation
1063
+ + i18n: add--interactive: mark status words for translation
1064
+ + i18n: add--interactive: remove %patch_modes entries
1065
+ + i18n: add--interactive: mark edit_hunk_manually message for translation
1066
+ + i18n: add--interactive: i18n of help_patch_cmd
1067
+ + i18n: add--interactive: mark patch prompt for translation
1068
+ + i18n: add--interactive: mark plural strings
1069
+ + i18n: clean.c: match string with git-add--interactive.perl
1070
+ + i18n: add--interactive: mark strings with interpolation for translation
1071
+ + i18n: add--interactive: mark simple here-documents for translation
1072
+ + i18n: add--interactive: mark strings for translation
1073
+ + Git.pm: add subroutines for commenting lines
1074
1075
Porcelain scripts written in Perl are getting internationalized.
1076
1168
- Will merge to 'next'.
1077
+ Will merge to 'master'.
1078
1079
1080
* jc/latin-1 (2016-09-26) 2 commits
@@ -1201,17 +1110,6 @@ of the repositories listed at
1110
cf. <20161208142401.1329-1-szeder.dev@gmail.com>
1111
1112
1204
-* jc/pull-rebase-ff (2016-11-29) 1 commit
1205
- (merged to 'next' on 2016-12-16 at c1a0cedd9e)
1206
- + pull: fast-forward "pull --rebase=true"
1207
-
1208
- "git pull --rebase", when there is no new commits on our side since
1209
- we forked from the upstream, should be able to fast-forward without
1210
- invoking "git rebase", but it didn't.
1211
-
1212
- Will merge to 'master'.
1213
-
1214
-
1113
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
1114
(merged to 'next' on 2016-12-05 at 041946dae0)
1115
+ merge: drop 'git merge <message> HEAD <commit>' syntax