What's cooking (2016/01 #05)
Junio C Hamano committed
Jan 26, 2016 at 16:20 UTC
1ed08b0caa4274b00f0475ee182f67a955fdc213
1 file changed
+449
-473
whats-cooking.txt
+449
-473
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2016, #04; Wed, 20)
4
-X-master-at: 3ee1e0fe11e2eb617170d0487fccfffc67f2b82b
5
-X-next-at: 9df04547ff2623b1b0f211cc82ef42c01b6dd101
3
+Subject: What's cooking in git.git (Jan 2016, #05; Tue, 26)
4
+X-master-at: d10e2cb9d0299a26f43d57dd5bdcf2b3f86a30b3
5
+X-next-at: 2d793f61b3b211a574b86fbf9750d86a2ebf6ae1
6
7
-What's cooking in git.git (Jan 2016, #04; Wed, 20)
7
+What's cooking in git.git (Jan 2016, #05; Tue, 26)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,11 +12,14 @@ 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 tip of 'master' now has second batch of topics merged, some of
15
+The tip of 'master' now has a few batches of topics merged, some of
16
which should later be merged to 'maint'. There are a few topics
17
that are v2.7.0 regression fixes still cooking outside 'master',
18
which also need to be merged to 'maint' for the maintenance release.
19
20
+A big thank-you to Elia Pinto for resurrecting a long-stalled http
21
+proxy-auth topic.
22
+
23
You can find the changes described here in the integration branches of the
24
repositories listed at
25
@@ -25,179 +28,371 @@ repositories listed at
28
--------------------------------------------------
29
[Graduated to "master"]
30
28
-* dk/reflog-walk-with-non-commit (2016-01-05) 1 commit
29
- (merged to 'next' on 2016-01-12 at 5f7b10e)
30
- + reflog-walk: don't segfault on non-commit sha1's in the reflog
31
+* ak/format-patch-odir-config (2016-01-13) 1 commit
32
+ (merged to 'next' on 2016-01-20 at 97c699b)
33
+ + format-patch: introduce format.outputDirectory configuration
34
32
- "git reflog" incorrectly assumed that all objects that used to be
33
- at the tip of a ref must be commits, which caused it to segfault.
35
+ "git format-patch" learned to notice format.outputDirectory
36
+ configuration variable. This allows "-o <dir>" option to be
37
+ omitted on the command line if you always use the same directory in
38
+ your workflow.
39
40
36
-* dw/signoff-doc (2016-01-05) 1 commit
37
- (merged to 'next' on 2016-01-12 at 1b08b48)
38
- + Expand documentation describing --signoff
41
+* ep/shell-command-substitution-style (2016-01-12) 92 commits
42
+ (merged to 'next' on 2016-01-20 at ae1b1d8)
43
+ + t9901-git-web--browse.sh: use the $( ... ) construct for command substitution
44
+ + t9501-gitweb-standalone-http-status.sh: use the $( ... ) construct for command substitution
45
+ + t9350-fast-export.sh: use the $( ... ) construct for command substitution
46
+ + t9300-fast-import.sh: use the $( ... ) construct for command substitution
47
+ + t9150-svk-mergetickets.sh: use the $( ... ) construct for command substitution
48
+ + t9145-git-svn-master-branch.sh: use the $( ... ) construct for command substitution
49
+ + t9138-git-svn-authors-prog.sh: use the $( ... ) construct for command substitution
50
+ + t9137-git-svn-dcommit-clobber-series.sh: use the $( ... ) construct for command substitution
51
+ + t9132-git-svn-broken-symlink.sh: use the $( ... ) construct for command substitution
52
+ + t9130-git-svn-authors-file.sh: use the $( ... ) construct for command substitution
53
+ + t9129-git-svn-i18n-commitencoding.sh: use the $( ... ) construct for command substitution
54
+ + t9119-git-svn-info.sh: use the $( ... ) construct for command substitution
55
+ + t9118-git-svn-funky-branch-names.sh: use the $( ... ) construct for command substitution
56
+ + t9114-git-svn-dcommit-merge.sh: use the $( ... ) construct for command substitution
57
+ + t9110-git-svn-use-svm-props.sh: use the $( ... ) construct for command substitution
58
+ + t9109-git-svn-multi-glob.sh: use the $( ... ) construct for command substitution
59
+ + t9108-git-svn-glob.sh: use the $( ... ) construct for command substitution
60
+ + t9107-git-svn-migrate.sh: use the $( ... ) construct for command substitution
61
+ + t9105-git-svn-commit-diff.sh: use the $( ... ) construct for command substitution
62
+ + t9104-git-svn-follow-parent.sh: use the $( ... ) construct for command substitution
63
+ + t9101-git-svn-props.sh: use the $( ... ) construct for command substitution
64
+ + t9100-git-svn-basic.sh: use the $( ... ) construct for command substitution
65
+ + t/t9001-send-email.sh: use the $( ... ) construct for command substitution
66
+ + t/t8003-blame-corner-cases.sh: use the $( ... ) construct for command substitution
67
+ + t/t7700-repack.sh: use the $( ... ) construct for command substitution
68
+ + t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substitution
69
+ + t/t7505-prepare-commit-msg-hook.sh: use the $( ... ) construct for command substitution
70
+ + t/t7504-commit-msg-hook.sh: use the $( ... ) construct for command substitution
71
+ + t/t7408-submodule-reference.sh: use the $( ... ) construct for command substitution
72
+ + t/t7406-submodule-update.sh: use the $( ... ) construct for command substitution
73
+ + t/t7103-reset-bare.sh: use the $( ... ) construct for command substitution
74
+ + t/t7006-pager.sh: use the $( ... ) construct for command substitution
75
+ + t/t7004-tag.sh: use the $( ... ) construct for command substitution
76
+ + t/t7003-filter-branch.sh: use the $( ... ) construct for command substitution
77
+ + t/t7001-mv.sh: use the $( ... ) construct for command substitution
78
+ + t/t6132-pathspec-exclude.sh: use the $( ... ) construct for command substitution
79
+ + t/t6032-merge-large-rename.sh: use the $( ... ) construct for command substitution
80
+ + t/t6015-rev-list-show-all-parents.sh: use the $( ... ) construct for command substitution
81
+ + t/t6002-rev-list-bisect.sh: use the $( ... ) construct for command substitution
82
+ + t/t6001-rev-list-graft.sh: use the $( ... ) construct for command substitution
83
+ + t/t5900-repo-selection.sh: use the $( ... ) construct for command substitution
84
+ + t/t5710-info-alternate.sh: use the $( ... ) construct for command substitution
85
+ + t/t5700-clone-reference.sh: use the $( ... ) construct for command substitution
86
+ + t/t5601-clone.sh: use the $( ... ) construct for command substitution
87
+ + t/t5570-git-daemon.sh: use the $( ... ) construct for command substitution
88
+ + t/t5550-http-fetch-dumb.sh: use the $( ... ) construct for command substitution
89
+ + t/t5538-push-shallow.sh: use the $( ... ) construct for command substitution
90
+ + t/t5537-fetch-shallow.sh: use the $( ... ) construct for command substitution
91
+ + t/t5532-fetch-proxy.sh: use the $( ... ) construct for command substitution
92
+ + t/t5530-upload-pack-error.sh: use the $( ... ) construct for command substitution
93
+ + t/t5522-pull-symlink.sh: use the $( ... ) construct for command substitution
94
+ + t/t5517-push-mirror.sh: use the $( ... ) construct for command substitution
95
+ + t/t5516-fetch-push.sh: use the $( ... ) construct for command substitution
96
+ + t/t5515-fetch-merge-logic.sh: use the $( ... ) construct for command substitution
97
+ + t/t5510-fetch.sh: use the $( ... ) construct for command substitution
98
+ + t/t5506-remote-groups.sh: use the $( ... ) construct for command substitution
99
+ + t/t5505-remote.sh: use the $( ... ) construct for command substitution
100
+ + t/t5500-fetch-pack.sh: use the $( ... ) construct for command substitution
101
+ + t/t5305-include-tag.sh: use the $( ... ) construct for command substitution
102
+ + t/t5304-prune.sh: use the $( ... ) construct for command substitution
103
+ + t/t5303-pack-corruption-resilience.sh: use the $( ... ) construct for command substitution
104
+ + t/t5100: no need to use 'echo' command substitutions for globbing
105
+ + t/t5302-pack-index.sh: use the $( ... ) construct for command substitution
106
+ + t/t5301-sliding-window.sh: use the $( ... ) construct for command substitution
107
+ + t/t5300-pack-object.sh: use the $( ... ) construct for command substitution
108
+ + t/t5100-mailinfo.sh: use the $( ... ) construct for command substitution
109
+ + t/t3700-add.sh: use the $( ... ) construct for command substitution
110
+ + t/t3600-rm.sh: use the $( ... ) construct for command substitution
111
+ + t/t3511-cherry-pick-x.sh: use the $( ... ) construct for command substitution
112
+ + t/t3403-rebase-skip.sh: use the $( ... ) construct for command substitution
113
+ + t/t3210-pack-refs.sh: use the $( ... ) construct for command substitution
114
+ + t/t3101-ls-tree-dirname.sh: use the $( ... ) construct for command substitution
115
+ + t/t3100-ls-tree-restrict.sh: use the $( ... ) construct for command substitution
116
+ + t/t3030-merge-recursive.sh: use the $( ... ) construct for command substitution
117
+ + t/t2102-update-index-symlinks.sh: use the $( ... ) construct for command substitution
118
+ + t/t2025-worktree-add.sh: use the $( ... ) construct for command substitution
119
+ + t/t1700-split-index.sh: use the $( ... ) construct for command substitution
120
+ + t/t1512-rev-parse-disambiguation.sh: use the $( ... ) construct for command substitution
121
+ + t/t1511-rev-parse-caret.sh: use the $( ... ) construct for command substitution
122
+ + t/t1410-reflog.sh: use the $( ... ) construct for command substitution
123
+ + t/t1401-symbolic-ref.sh: use the $( ... ) construct for command substitution
124
+ + t/t1100-commit-tree-options.sh: use the $( ... ) construct for command substitution
125
+ + unimplemented.sh: use the $( ... ) construct for command substitution
126
+ + test-sha1.sh: use the $( ... ) construct for command substitution
127
+ + t/lib-httpd.sh: use the $( ... ) construct for command substitution
128
+ + git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
129
+ + contrib/thunderbird-patch-inline/appp.sh: use the $( ... ) construct for command substitution
130
+ + contrib/examples/git-revert.sh: use the $( ... ) construct for command substitution
131
+ + contrib/examples/git-repack.sh: use the $( ... ) construct for command substitution
132
+ + contrib/examples/git-merge.sh: use the $( ... ) construct for command substitution
133
+ + contrib/examples/git-fetch.sh: use the $( ... ) construct for command substitution
134
+ + contrib/examples/git-commit.sh: use the $( ... ) construct for command substitution
135
40
- The documentation has been updated to hint the connection between
41
- the '--signoff' option and DCO.
136
+ A shell script style update to change `command substitution` into
137
+ $(command substitution). Coverts contrib/ and much of the t/
138
+ directory contents.
139
140
44
-* ew/for-each-ref-doc (2016-01-05) 1 commit
45
- (merged to 'next' on 2016-01-12 at e5c4e75)
46
- + for-each-ref: document `creatordate` and `creator` fields
141
+* jk/ok-to-fail-gc-auto-in-rebase (2016-01-13) 1 commit
142
+ (merged to 'next' on 2016-01-20 at c9a8e82)
143
+ + rebase: ignore failures from "gc --auto"
144
145
+ "git rebase", unlike all other callers of "gc --auto", did not
146
+ ignore the exit code from "gc --auto".
147
49
-* ew/send-email-mutt-alias-fix (2016-01-04) 1 commit
50
- (merged to 'next' on 2016-01-12 at 84d1329)
51
- + git-send-email: do not double-escape quotes from mutt
148
53
- "git send-email" was confused by escaped quotes stored in the alias
54
- files saved by "mutt", which has been corrected.
149
+* jk/symbolic-ref (2016-01-13) 6 commits
150
+ (merged to 'next' on 2016-01-20 at 30b5408)
151
+ + lock_ref_sha1_basic: handle REF_NODEREF with invalid refs
152
+ + lock_ref_sha1_basic: always fill old_oid while holding lock
153
+ + checkout,clone: check return value of create_symref
154
+ + create_symref: write reflog while holding lock
155
+ + create_symref: use existing ref-lock code
156
+ + create_symref: modernize variable names
157
158
+ The low-level code that is used to create symbolic references has
159
+ been updated to share more code with the code that deals with
160
+ normal references.
161
57
-* ho/gitweb-squelch-undef-warning (2016-01-12) 1 commit
58
- (merged to 'next' on 2016-01-12 at ef4fc5f)
59
- + gitweb: squelch "uninitialized value" warning
162
61
- Asking gitweb for a nonexistent commit left a warning in the server
62
- log.
163
+* js/close-packs-before-gc (2016-01-13) 4 commits
164
+ (merged to 'next' on 2016-01-20 at 16cf87b)
165
+ + receive-pack: release pack files before garbage-collecting
166
+ + merge: release pack files before garbage-collecting
167
+ + am: release pack files before garbage-collecting
168
+ + fetch: release pack files before garbage-collecting
169
64
- Somebody may want to follow this up with a new test, perhaps?
65
- IIRC, we do test that no Perl warnings are given to the server log,
66
- so this should have been caught if our test coverage were good.
170
+ Many codepaths that run "gc --auto" before exiting kept packfiles
171
+ mapped and left the file descriptors to them open, which was not
172
+ friendly to systems that cannot remove files that are open. They
173
+ now close the packs before doing so.
174
175
69
-* jk/clang-pedantic (2016-01-04) 2 commits
70
- (merged to 'next' on 2016-01-12 at b5be271)
71
- + bswap: add NO_UNALIGNED_LOADS define
72
- + avoid shifting signed integers 31 bits
176
+* js/pull-rebase-i (2016-01-13) 3 commits
177
+ (merged to 'next' on 2016-01-20 at a0c5440)
178
+ + completion: add missing branch.*.rebase values
179
+ + remote: handle the config setting branch.*.rebase=interactive
180
+ + pull: allow interactive rebase with --rebase=interactive
181
74
- A few unportable C construct have been spotted by clang compiler
75
- and have been fixed.
182
+ "git pull --rebase" has been extended to allow invoking
183
+ "rebase -i".
184
185
78
-* jk/pack-revindex (2015-12-21) 2 commits
79
- (merged to 'next' on 2016-01-12 at 2e39a16)
80
- + pack-revindex: store entries directly in packed_git
81
- + pack-revindex: drop hash table
186
+* rm/subtree-unwrap-tags (2015-11-24) 1 commit
187
+ (merged to 'next' on 2016-01-20 at 6373d95)
188
+ + contrib/subtree: unwrap tag refs
189
83
- In-core storage of the reverse index for .pack files (which lets
84
- you go from a pack offset to an object name) has been streamlined.
190
+ "git subtree" (in contrib/) records the tag object name in the
191
+ commit log message when a subtree is added using a tag, without
192
+ peeling it down to the underlying commit. The tag needs to be
193
+ peeled when "git subtree split" wants to work on the commit, but
194
+ the command forgot to do so.
195
196
87
-* js/fopen-harder (2016-01-11) 2 commits
88
- (merged to 'next' on 2016-01-12 at c6ef194)
89
- + Handle more file writes correctly in shared repos
90
- + commit: allow editing the commit message even in shared repos
197
+* rp/p4-filetype-change (2016-01-13) 1 commit
198
+ (merged to 'next' on 2016-01-20 at 7b5954b)
199
+ + git-p4.py: add support for filetype change
200
92
- Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR
93
- (e.g. COMMIT_EDITMSG) that is meant to be left after the command is
94
- done. This however did not work well if the repository is set to
95
- be shared with core.sharedRepository and the umask of the previous
96
- user is tighter. They have been made to work better by calling
97
- unlink(2) and retrying after fopen(3) fails with EPERM.
201
+ "git p4" learned to cope with the type of a file getting changed.
202
203
+--------------------------------------------------
204
+[New Topics]
205
100
-* mh/notes-allow-reading-treeish (2016-01-12) 1 commit
101
- (merged to 'next' on 2016-01-12 at 7aa311f)
102
- + notes: allow treeish expressions as notes ref
206
+* lv/add-doc-working-tree (2016-01-21) 1 commit
207
+ (merged to 'next' on 2016-01-26 at c5b1ab1)
208
+ + git-add doc: do not say working directory when you mean working tree
209
104
- Originally merged to 'next' on 2015-10-23
210
+ Will merge to 'master'.
211
106
- Some "git notes" operations, e.g. "git log --notes=<note>", should
107
- be able to read notes from any tree-ish that is shaped like a notes
108
- tree, but the notes infrastructure required that the argument must
109
- be a ref under refs/notes/. Loosen it to require a valid ref only
110
- when the operation would update the notes (in which case we must
111
- have a place to store the updated notes tree, iow, a ref).
212
213
+* mk/asciidoctor-bq-workaround (2016-01-20) 1 commit
214
+ (merged to 'next' on 2016-01-26 at 19a742a)
215
+ + Documentation: remove unnecessary backslashes
216
114
-* nd/clear-gitenv-upon-use-of-alias (2015-12-29) 5 commits
115
- (merged to 'next' on 2016-01-12 at 696b1f5)
116
- + run-command: don't warn on SIGPIPE deaths
117
- + git.c: make sure we do not leak GIT_* to alias scripts
118
- + setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..
119
- + git.c: make it clear save_env() is for alias handling only
120
- + Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias
217
+ Will merge to 'master'.
218
122
- d95138e6 (setup: set env $GIT_WORK_TREE when work tree is set, like
123
- $GIT_DIR, 2015-06-26) attempted to work around a glitch in alias
124
- handling by overwriting GIT_WORK_TREE environment variable to
125
- affect subprocesses when set_git_work_tree() gets called, which
126
- resulted in a rather unpleasant regression to "clone" and "init".
127
- Try to address the same issue by always restoring the environment
128
- and respawning the real underlying command when handling alias.
219
220
+* nd/diff-with-path-params (2016-01-21) 2 commits
221
+ (merged to 'next' on 2016-01-26 at b29a363)
222
+ + diff: make -O and --output work in subdirectory
223
+ + diff-no-index: do not take a redundant prefix argument
224
131
-* nd/dir-exclude-cleanup (2015-12-28) 1 commit
132
- (merged to 'next' on 2016-01-12 at e6584c9)
133
- + dir.c: clean the entire struct in clear_exclude_list()
225
+ A few options of "git diff" did not work well when the command was
226
+ run from a subdirectory.
227
135
- The "exclude_list" structure has the usual "alloc, nr" pair of
136
- fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
137
- to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
138
- array.
228
+ Will merge to 'master'.
229
230
141
-* nd/exclusion-regression-fix (2016-01-08) 1 commit
142
- (merged to 'next' on 2016-01-12 at 0eb98a5)
143
- + Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"
231
+* tb/complete-word-diff-regex (2016-01-20) 1 commit
232
+ (merged to 'next' on 2016-01-26 at a5beecc)
233
+ + completion: complete "diff --word-diff-regex="
234
145
- The ignore mechanism saw a few regressions around untracked file
146
- listing and sparse checkout selection areas in 2.7.0; the change
147
- that is responsible for the regression has been reverted.
235
+ Will merge to 'master'.
236
237
150
-* nd/ita-cleanup (2015-12-28) 3 commits
151
- (merged to 'next' on 2016-01-12 at 008a6e3)
152
- + grep: make it clear i-t-a entries are ignored
153
- + add and use a convenience macro ce_intent_to_add()
154
- + blame: remove obsolete comment
238
+* tg/ls-remote-symref (2016-01-19) 5 commits
239
+ (merged to 'next' on 2016-01-26 at e466ee2)
240
+ + ls-remote: add support for showing symrefs
241
+ + ls-remote: use parse-options api
242
+ + ls-remote: fix synopsis
243
+ + ls-remote: document --refs option
244
+ + ls-remote: document --quiet option
245
156
- Paths that have been told the index about with "add -N" are not
157
- quite yet in the index, but a few commands behaved as if they
158
- already are in a harmful way.
246
+ Teach "ls-remote" an option to show which branch the remote
247
+ repository advertises as its primary by pointing its HEAD at.
248
249
+ Will merge to 'master'.
250
161
-* sg/t6050-failing-editor-test-fix (2016-01-05) 1 commit
162
- (merged to 'next' on 2016-01-12 at dc08a19)
163
- + t6050-replace: make failing editor test more robust
251
252
+* jk/ref-cache-non-repository-optim (2016-01-25) 2 commits
253
+ (merged to 'next' on 2016-01-26 at 09057bc)
254
+ + resolve_gitlink_ref: ignore non-repository paths
255
+ + clean: make is_git_repository a public function
256
166
-* ss/clone-depth-single-doc (2016-01-08) 3 commits
167
- (merged to 'next' on 2016-01-12 at 16ded8c)
168
- + docs: clarify that --depth for git-fetch works with newly initialized repos
169
- + docs: say "commits" in the --depth option wording for git-clone
170
- + docs: clarify that passing --depth to git-clone implies --single-branch
257
+ Teach the underlying machinery used by "ls-files -o" and other
258
+ commands not to create empty submodule ref cache for a directory
259
+ that is not a submodule. This removes a ton of wasted CPU cycles.
260
172
- Documentation for "git fetch --depth" has been updated for clarity.
261
+ Will merge to 'master'.
262
263
175
-* ss/user-manual (2015-12-30) 4 commits
176
- (merged to 'next' on 2016-01-12 at c7f0328)
177
- + user-manual: add addition gitweb information
178
- + user-manual: add section documenting shallow clones
179
- + glossary: define the term shallow clone
180
- + user-manual: remove temporary branch entry from todo list
264
+* jk/completion-rebase (2016-01-25) 1 commit
265
+ (merged to 'next' on 2016-01-26 at def3e0b)
266
+ + completion: add missing git-rebase options
267
+
268
+ Will merge to 'master'.
269
+
270
+
271
+* jk/list-tag-2.7-regression (2016-01-26) 2 commits
272
+ (merged to 'next' on 2016-01-26 at fb9ccee)
273
+ + tag: do not show ambiguous tag names as "tags/foo"
274
+ + t6300: use test_atom for some un-modern tests
275
+
276
+ "git tag" started listing a tag "foo" as "tags/foo" when a branch
277
+ named "foo" exists in the same repository; remove this unnecessary
278
+ disambiguation, which is a regression introduced in v2.7.0.
279
+
280
+ Will merge to 'master'.
281
+
282
+
283
+* pw/completion-show-branch (2016-01-25) 1 commit
284
+ (merged to 'next' on 2016-01-26 at d0d7735)
285
+ + completion: complete show-branch "--date-order"
286
+
287
+ Will merge to 'master'.
288
+
289
+
290
+* js/mingw-tests (2016-01-26) 20 commits
291
+ - mingw: skip a test in t9130 that cannot pass on Windows
292
+ - mingw: do not bother to test funny file names
293
+ - mingw: handle the missing POSIXPERM prereq in t9124
294
+ - mingw: avoid illegal filename in t9118
295
+ - mingw: mark t9100's test cases with appropriate prereqs
296
+ - Avoid absolute path in t0008
297
+ - mingw: work around pwd issues in the tests
298
+ - mingw: fix t9700's assumption about directory separators
299
+ - mingw: skip test in t1508 that fails due to path conversion
300
+ - tests: turn off git-daemon tests if FIFOs are not available
301
+ - mingw: disable mkfifo-based tests
302
+ - mingw: accomodate t0060-path-utils for MSYS2
303
+ - mingw: fix t5601-clone.sh
304
+ - mingw: let lstat() fail with errno == ENOTDIR when appropriate
305
+ - mingw: try to delete target directory before renaming
306
+ - mingw: prepare the TMPDIR environment variable for shell scripts
307
+ - mingw: factor out Windows specific environment setup
308
+ - Git.pm: stop assuming that absolute paths start with a slash
309
+ - mingw: do not trust MSYS2's MinGW gettext.sh
310
+ - mingw: let's use gettext with MSYS2
311
+ (this branch uses js/msys2.)
312
+
313
+ Updates test scripts to remove assumptions that are not portable
314
+ between Git for POSIX and Git for Windows, or to skip ones with
315
+ expectations that are not satisfiable on Git for Windows.
316
+
317
+ Looks mostly done, but I had to tweak a few things, so
318
+ Waiting for re-test.
319
+
320
+
321
+* js/xmerge-maker-eol (2016-01-26) 2 commits
322
+ - merge-file: ensure that conflict sections match eol style
323
+ - merge-file: let conflict markers match end-of-line style of the context
324
+
325
+ The low-level merge machinery has been taught to use CRLF line
326
+ termination when inserting conflict markers to merged contents that
327
+ are themselves CRLF line-terminated.
328
+
329
+ Will merge to 'next'.
330
182
- Drop a few old "todo" items by deciding that the change one of them
183
- suggests is not such a good idea, and doing the change the other
184
- one suggested to do.
331
332
+* nd/clear-gitenv-upon-use-of-alias (2016-01-26) 3 commits
333
+ - git: simplify environment save/restore logic
334
+ - git: protect against unbalanced calls to {save,restore}_env()
335
+ - git: remove an early return from save_env_before_alias()
336
187
-* tg/grep-no-index-fallback (2016-01-12) 2 commits
188
- (merged to 'next' on 2016-01-12 at 8960bdd)
189
- + builtin/grep: add grep.fallbackToNoIndex config
190
- + t7810: correct --no-index test
337
+ The automatic typo correction applied to an alias was broken
338
+ with a recent change already in 'master'.
339
192
- "git grep" by default does not fall back to its "--no-index"
193
- behaviour outside a directory under Git's control (otherwise the
194
- user may by mistake end up running a huge recursive search); with a
195
- new configuration (set in $HOME/.gitconfig--by definition this
196
- cannot be set in the config file per project), this safety can be
197
- disabled.
340
+ Waiting for a response.
341
+ This is my attempt to clarify an original from Duy by splitting it
342
+ into a minimal fix and clean-up.
343
+
344
+
345
+* pw/completion-stash (2016-01-26) 1 commit
346
+ (merged to 'next' on 2016-01-26 at e41153c)
347
+ + completion: update completion arguments for stash
348
+
349
+ Will merge to 'master'.
350
351
--------------------------------------------------
200
-[New Topics]
352
+[Stalled]
353
+
354
+* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
355
+ - t/lib-git-svn: check same httpd module dirs as lib-httpd
356
+ - t/lib-httpd: load mod_unixd
357
+
358
+ This is the first two commits in a three-patch series $gmane/266962
359
+
360
+ Becoming tired of waiting for a reroll.
361
+ with updated log message ($gmane/268061).
362
+ Will discard.
363
+
364
+
365
+* jc/diff-b-m (2015-02-23) 5 commits
366
+ . WIPWIP
367
+ . WIP: diff-b-m
368
+ - diffcore-rename: allow easier debugging
369
+ - diffcore-rename.c: add locate_rename_src()
370
+ - diffcore-break: allow debugging
371
+
372
+ "git diff -B -M" produced incorrect patch when the postimage of a
373
+ completely rewritten file is similar to the preimage of a removed
374
+ file; such a resulting file must not be expressed as a rename from
375
+ other place.
376
+
377
+ The fix in this patch is broken, unfortunately.
378
+ Will discard.
379
+
380
+--------------------------------------------------
381
+[Cooking]
382
+
383
+* kf/http-proxy-auth-methods (2016-01-26) 2 commits
384
+ - http: use credential API to handle proxy authentication
385
+ - http: allow selection of proxy authentication method
386
+
387
+ New http.proxyAuthMethod configuration variable can be used to
388
+ specify what authentication method to use, as a way to work around
389
+ proxies that do not give error response expected by libcurl when
390
+ CURLAUTH_ANY is used. Also, the codepath for proxy authentication
391
+ has been taught to use credential API to store the authentication
392
+ material in user's keyrings.
393
+
394
+ Will merge to 'next'.
395
+
396
397
* dg/subtree-rebase-test (2016-01-19) 1 commit
398
- contrib/subtree: Add a test for subtree rebase that loses commits
@@ -208,13 +403,14 @@ repositories listed at
403
404
405
* jk/shortlog (2016-01-19) 7 commits
211
- - shortlog: don't warn on empty author
212
- - shortlog: optimize out useless string list
213
- - shortlog: optimize out useless "<none>" normalization
214
- - shortlog: optimize "--summary" mode
215
- - shortlog: replace hand-parsing of author with pretty-printer
216
- - shortlog: use strbufs to read from stdin
217
- - shortlog: match both "Author:" and "author" on stdin
406
+ (merged to 'next' on 2016-01-22 at f1c688c)
407
+ + shortlog: don't warn on empty author
408
+ + shortlog: optimize out useless string list
409
+ + shortlog: optimize out useless "<none>" normalization
410
+ + shortlog: optimize "--summary" mode
411
+ + shortlog: replace hand-parsing of author with pretty-printer
412
+ + shortlog: use strbufs to read from stdin
413
+ + shortlog: match both "Author:" and "author" on stdin
414
415
"git shortlog" used to accumulate various pieces of information
416
regardless of what was asked to be shown in the final output. It
@@ -222,22 +418,23 @@ repositories listed at
418
(e.g. there is no need to collect the log messages when showing
419
only the number of changes).
420
225
- Will merge to 'next'.
421
+ Will merge to 'master'.
422
423
424
* jc/peace-with-crlf (2016-01-15) 12 commits
229
- - test-sha1-array: read command stream with strbuf_getline()
230
- - grep: read -f file with strbuf_getline()
231
- - send-pack: read list of refs with strbuf_getline()
232
- - column: read lines with strbuf_getline()
233
- - cat-file: read batch stream with strbuf_getline()
234
- - transport-helper: read helper response with strbuf_getline()
235
- - clone/sha1_file: read info/alternates with strbuf_getline()
236
- - remote.c: read $GIT_DIR/remotes/* with strbuf_getline()
237
- - ident.c: read /etc/mailname with strbuf_getline()
238
- - rev-parse: read parseopt spec with strbuf_getline()
239
- - revision: read --stdin with strbuf_getline()
240
- - hash-object: read --stdin-paths with strbuf_getline()
425
+ (merged to 'next' on 2016-01-26 at 08724bc)
426
+ + test-sha1-array: read command stream with strbuf_getline()
427
+ + grep: read -f file with strbuf_getline()
428
+ + send-pack: read list of refs with strbuf_getline()
429
+ + column: read lines with strbuf_getline()
430
+ + cat-file: read batch stream with strbuf_getline()
431
+ + transport-helper: read helper response with strbuf_getline()
432
+ + clone/sha1_file: read info/alternates with strbuf_getline()
433
+ + remote.c: read $GIT_DIR/remotes/* with strbuf_getline()
434
+ + ident.c: read /etc/mailname with strbuf_getline()
435
+ + rev-parse: read parseopt spec with strbuf_getline()
436
+ + revision: read --stdin with strbuf_getline()
437
+ + hash-object: read --stdin-paths with strbuf_getline()
438
(this branch uses jc/strbuf-getline.)
439
440
Teach codepaths that communicate with users by reading text files
@@ -246,49 +443,53 @@ repositories listed at
443
list of object names from the standard input instead of from the
444
command line, and does not involve files in the working tree.
445
249
- Will merge to 'next'.
446
+ Will merge to 'master'.
447
448
449
* dg/subtree-test (2016-01-19) 1 commit
253
- - contrib/subtree: Make testing easier
450
+ (merged to 'next' on 2016-01-26 at 81f1356)
451
+ + contrib/subtree: Make testing easier
452
255
- Needs review.
256
- ($gmane/284277)
453
+ Will merge to 'master'.
454
455
456
* jk/filter-branch-no-index (2016-01-19) 1 commit
260
- - filter-branch: resolve $commit^{tree} in no-index case
457
+ (merged to 'next' on 2016-01-22 at 312aa2c)
458
+ + filter-branch: resolve $commit^{tree} in no-index case
459
460
A recent optimization to filter-branch in v2.7.0 introduced a
461
regression when --prune-empty filter is used, which has been
462
corrected.
463
266
- Will merge to 'next'.
464
+ Will merge to 'master'.
465
466
467
* jk/sanity (2016-01-19) 1 commit
270
- - test-lib: clarify and tighten SANITY
468
+ (merged to 'next' on 2016-01-22 at 612cc5f)
469
+ + test-lib: clarify and tighten SANITY
470
471
The description for SANITY prerequisite the test suite uses has
472
been clarified both in the comment and in the implementation.
473
275
- Will merge to 'next'.
474
+ Will merge to 'master'.
475
476
278
-* ls/travis-prove-order (2016-01-19) 1 commit
279
- - travis-ci: run previously failed tests first, then slowest to fastest
477
+* ls/travis-prove-order (2016-01-26) 2 commits
478
+ (merged to 'next' on 2016-01-26 at d8e2a4a)
479
+ + travis-ci: explicity use container-based infrastructure
480
+ + travis-ci: run previously failed tests first, then slowest to fastest
481
482
By persisting runtime statistics of previous "prove" run, execute
483
tests that take longer before other ones, to reduce the total
484
wallclock time when running with Travis CI.
485
285
- Waiting for a reroll.
286
- ($gmane/284431)
486
+ Will merge to 'master'.
487
488
289
-* nd/do-not-move-worktree-manually (2016-01-19) 2 commits
290
- - worktree: stop supporting moving worktrees manually
291
- - worktree.c: fix indentation
489
+* nd/do-not-move-worktree-manually (2016-01-22) 2 commits
490
+ (merged to 'next' on 2016-01-26 at c539221)
491
+ + worktree: stop supporting moving worktrees manually
492
+ + worktree.c: fix indentation
493
494
"git worktree" had a broken code that attempted to auto-fix
495
possible inconsistency that results from end-users moving a
@@ -298,139 +499,51 @@ repositories listed at
499
obviously not adjust them), which actually made things worse
500
when triggered.
501
301
- Will merge to 'next'.
502
+ Will merge to 'master'.
503
504
304
-* sb/submodule-init (2016-01-20) 2 commits
505
+* sb/submodule-init (2016-01-25) 2 commits
506
- submodule: port init from shell to C
507
- submodule: port resolve_relative_url from shell to C
508
(this branch uses sb/submodule-parallel-update.)
509
309
- Needs review.
310
- ($gmane/284419)
311
-
312
---------------------------------------------------
313
-[Stalled]
314
-
315
-* kf/http-proxy-auth-methods (2015-11-04) 3 commits
316
- . SQUASH???
317
- . http: use credential API to handle proxy authentication
318
- . http: allow selection of proxy authentication method
319
-
320
- New http.proxyAuthMethod configuration variable can be used to
321
- specify what authentication method to use, as a way to work around
322
- proxies that do not give error response expected by libcurl when
323
- CURLAUTH_ANY is used. Also, the codepath for proxy authentication
324
- has been taught to use credential API to store the authentication
325
- material in user's keyrings.
326
-
327
- I ejected this from pu for the moment, as it conflicts with the
328
- pt/http-socks-proxy topic. That is now in master, so it can
329
- be re-rolled on top.
330
-
331
- Anybody wants to help rerolling this? Otherwise will discard.
332
-
510
+ Major part of "git submodule init" has been ported to C.
511
334
-* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
335
- - t/lib-git-svn: check same httpd module dirs as lib-httpd
336
- - t/lib-httpd: load mod_unixd
337
-
338
- This is the first two commits in a three-patch series $gmane/266962
339
-
340
- Becoming tired of waiting for a reroll.
341
- with updated log message ($gmane/268061).
342
- Will discard.
343
-
344
-
345
-* jc/diff-b-m (2015-02-23) 5 commits
346
- . WIPWIP
347
- . WIP: diff-b-m
348
- - diffcore-rename: allow easier debugging
349
- - diffcore-rename.c: add locate_rename_src()
350
- - diffcore-break: allow debugging
351
-
352
- "git diff -B -M" produced incorrect patch when the postimage of a
353
- completely rewritten file is similar to the preimage of a removed
354
- file; such a resulting file must not be expressed as a rename from
355
- other place.
356
-
357
- The fix in this patch is broken, unfortunately.
358
- Will discard.
359
-
360
---------------------------------------------------
361
-[Cooking]
362
-
363
-* js/pull-rebase-i (2016-01-13) 3 commits
364
- (merged to 'next' on 2016-01-20 at a0c5440)
365
- + completion: add missing branch.*.rebase values
366
- + remote: handle the config setting branch.*.rebase=interactive
367
- + pull: allow interactive rebase with --rebase=interactive
368
-
369
- "git pull --rebase" has been extended to allow invoking
370
- "rebase -i".
371
-
372
- Will merge to 'master'.
373
-
374
-
375
-* jk/ok-to-fail-gc-auto-in-rebase (2016-01-13) 1 commit
376
- (merged to 'next' on 2016-01-20 at c9a8e82)
377
- + rebase: ignore failures from "gc --auto"
378
-
379
- "git rebase", unlike all other callers of "gc --auto", did not
380
- ignore the exit code from "gc --auto".
381
-
382
- Will merge to 'master'.
383
-
384
-
385
-* js/close-packs-before-gc (2016-01-13) 4 commits
386
- (merged to 'next' on 2016-01-20 at 16cf87b)
387
- + receive-pack: release pack files before garbage-collecting
388
- + merge: release pack files before garbage-collecting
389
- + am: release pack files before garbage-collecting
390
- + fetch: release pack files before garbage-collecting
391
-
392
- Many codepaths that run "gc --auto" before exiting kept packfiles
393
- mapped and left the file descriptors to them open, which was not
394
- friendly to systems that cannot remove files that are open. They
395
- now close the packs before doing so.
396
-
397
- Will merge to 'master'.
512
+ Will have to wait for 'sb/submodule-parallel-update'.
513
514
515
* js/msys2 (2016-01-15) 9 commits
401
- - mingw: uglify (a, 0) definitions to shut up warnings
402
- - mingw: squash another warning about a cast
403
- - mingw: avoid warnings when casting HANDLEs to int
404
- - mingw: avoid redefining S_* constants
405
- - compat/winansi: support compiling with MSys2
406
- - compat/mingw: support MSys2-based MinGW build
407
- - nedmalloc: allow compiling with MSys2's compiler
408
- - config.mak.uname: supporting 64-bit MSys2
409
- - config.mak.uname: support MSys2
516
+ (merged to 'next' on 2016-01-22 at 8bab6ab)
517
+ + mingw: uglify (a, 0) definitions to shut up warnings
518
+ + mingw: squash another warning about a cast
519
+ + mingw: avoid warnings when casting HANDLEs to int
520
+ + mingw: avoid redefining S_* constants
521
+ + compat/winansi: support compiling with MSys2
522
+ + compat/mingw: support MSys2-based MinGW build
523
+ + nedmalloc: allow compiling with MSys2's compiler
524
+ + config.mak.uname: supporting 64-bit MSys2
525
+ + config.mak.uname: support MSys2
526
+ (this branch is used by js/mingw-tests.)
527
528
Beginning of the upstreaming process of Git for Windows effort.
529
413
- Will merge to 'next'.
414
-
415
-
416
-* rp/p4-filetype-change (2016-01-13) 1 commit
417
- (merged to 'next' on 2016-01-20 at 7b5954b)
418
- + git-p4.py: add support for filetype change
419
-
530
Will merge to 'master'.
531
532
533
* tk/interpret-trailers-in-place (2016-01-14) 2 commits
424
- - interpret-trailers: add option for in-place editing
425
- - trailer: allow to write to files other than stdout
534
+ (merged to 'next' on 2016-01-22 at 5db0cf8)
535
+ + interpret-trailers: add option for in-place editing
536
+ + trailer: allow to write to files other than stdout
537
538
"interpret-trailers" has been taught to optionally update a file in
539
place, instead of always writing the result to the standard output.
540
430
- Will merge to 'next'.
541
+ Will merge to 'master'.
542
543
433
-* js/dirname-basename (2016-01-15) 5 commits
544
+* js/dirname-basename (2016-01-25) 6 commits
545
+ (merged to 'next' on 2016-01-26 at b16b2b8)
546
+ + mingw: avoid linking to the C library's isalpha()
547
(merged to 'next' on 2016-01-20 at d198512)
548
+ t0060: loosen overly strict expectations
549
(merged to 'next' on 2016-01-12 at c3c970a)
@@ -457,19 +570,9 @@ repositories listed at
570
($gmane/283971)
571
572
460
-* ak/format-patch-odir-config (2016-01-13) 1 commit
461
- (merged to 'next' on 2016-01-20 at 97c699b)
462
- + format-patch: introduce format.outputDirectory configuration
463
-
464
- Allow "-o <dir>" option to be omitted on the command line of "git
465
- format-patch" if you always use the same directory in your
466
- workflow.
467
-
468
- Will merge to 'master'.
469
-
470
-
573
* jk/notes-merge-from-anywhere (2016-01-17) 1 commit
472
- - notes: allow merging from arbitrary references
574
+ (merged to 'next' on 2016-01-26 at c60ac66)
575
+ + notes: allow merging from arbitrary references
576
577
"git notes merge" used to limit the source of the merged notes tree
578
to somewhere under refs/notes/ hierarchy, which was too limiting
@@ -477,135 +580,22 @@ repositories listed at
580
repositories using remote-tracking notes trees (located in e.g.
581
refs/remote-notes/ or somesuch).
582
480
- Will merge to 'next'.
583
+ Will merge to 'master'.
584
585
483
-* dt/unpack-compare-entry-optim (2016-01-05) 1 commit
586
+* dt/unpack-compare-entry-optim (2016-01-22) 2 commits
587
+ (merged to 'next' on 2016-01-26 at 110e053)
588
+ + unpack-trees: fix accidentally quadratic behavior
589
(merged to 'next' on 2016-01-20 at 180dccf)
590
+ do_compare_entry: use already-computed path
591
487
- Will merge to 'master'.
488
-
489
-
490
-* jk/symbolic-ref (2016-01-13) 6 commits
491
- (merged to 'next' on 2016-01-20 at 30b5408)
492
- + lock_ref_sha1_basic: handle REF_NODEREF with invalid refs
493
- + lock_ref_sha1_basic: always fill old_oid while holding lock
494
- + checkout,clone: check return value of create_symref
495
- + create_symref: write reflog while holding lock
496
- + create_symref: use existing ref-lock code
497
- + create_symref: modernize variable names
498
-
499
- The low-level code that is used to create symbolic references has
500
- been updated to share more code with the code that deals with
501
- normal references.
592
+ "git checkout $branch" (and other operations that share the same
593
+ underlying machinery) has been optimized.
594
595
Will merge to 'master'.
596
597
506
-* ep/shell-command-substitution-style (2016-01-12) 92 commits
507
- (merged to 'next' on 2016-01-20 at ae1b1d8)
508
- + t9901-git-web--browse.sh: use the $( ... ) construct for command substitution
509
- + t9501-gitweb-standalone-http-status.sh: use the $( ... ) construct for command substitution
510
- + t9350-fast-export.sh: use the $( ... ) construct for command substitution
511
- + t9300-fast-import.sh: use the $( ... ) construct for command substitution
512
- + t9150-svk-mergetickets.sh: use the $( ... ) construct for command substitution
513
- + t9145-git-svn-master-branch.sh: use the $( ... ) construct for command substitution
514
- + t9138-git-svn-authors-prog.sh: use the $( ... ) construct for command substitution
515
- + t9137-git-svn-dcommit-clobber-series.sh: use the $( ... ) construct for command substitution
516
- + t9132-git-svn-broken-symlink.sh: use the $( ... ) construct for command substitution
517
- + t9130-git-svn-authors-file.sh: use the $( ... ) construct for command substitution
518
- + t9129-git-svn-i18n-commitencoding.sh: use the $( ... ) construct for command substitution
519
- + t9119-git-svn-info.sh: use the $( ... ) construct for command substitution
520
- + t9118-git-svn-funky-branch-names.sh: use the $( ... ) construct for command substitution
521
- + t9114-git-svn-dcommit-merge.sh: use the $( ... ) construct for command substitution
522
- + t9110-git-svn-use-svm-props.sh: use the $( ... ) construct for command substitution
523
- + t9109-git-svn-multi-glob.sh: use the $( ... ) construct for command substitution
524
- + t9108-git-svn-glob.sh: use the $( ... ) construct for command substitution
525
- + t9107-git-svn-migrate.sh: use the $( ... ) construct for command substitution
526
- + t9105-git-svn-commit-diff.sh: use the $( ... ) construct for command substitution
527
- + t9104-git-svn-follow-parent.sh: use the $( ... ) construct for command substitution
528
- + t9101-git-svn-props.sh: use the $( ... ) construct for command substitution
529
- + t9100-git-svn-basic.sh: use the $( ... ) construct for command substitution
530
- + t/t9001-send-email.sh: use the $( ... ) construct for command substitution
531
- + t/t8003-blame-corner-cases.sh: use the $( ... ) construct for command substitution
532
- + t/t7700-repack.sh: use the $( ... ) construct for command substitution
533
- + t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substitution
534
- + t/t7505-prepare-commit-msg-hook.sh: use the $( ... ) construct for command substitution
535
- + t/t7504-commit-msg-hook.sh: use the $( ... ) construct for command substitution
536
- + t/t7408-submodule-reference.sh: use the $( ... ) construct for command substitution
537
- + t/t7406-submodule-update.sh: use the $( ... ) construct for command substitution
538
- + t/t7103-reset-bare.sh: use the $( ... ) construct for command substitution
539
- + t/t7006-pager.sh: use the $( ... ) construct for command substitution
540
- + t/t7004-tag.sh: use the $( ... ) construct for command substitution
541
- + t/t7003-filter-branch.sh: use the $( ... ) construct for command substitution
542
- + t/t7001-mv.sh: use the $( ... ) construct for command substitution
543
- + t/t6132-pathspec-exclude.sh: use the $( ... ) construct for command substitution
544
- + t/t6032-merge-large-rename.sh: use the $( ... ) construct for command substitution
545
- + t/t6015-rev-list-show-all-parents.sh: use the $( ... ) construct for command substitution
546
- + t/t6002-rev-list-bisect.sh: use the $( ... ) construct for command substitution
547
- + t/t6001-rev-list-graft.sh: use the $( ... ) construct for command substitution
548
- + t/t5900-repo-selection.sh: use the $( ... ) construct for command substitution
549
- + t/t5710-info-alternate.sh: use the $( ... ) construct for command substitution
550
- + t/t5700-clone-reference.sh: use the $( ... ) construct for command substitution
551
- + t/t5601-clone.sh: use the $( ... ) construct for command substitution
552
- + t/t5570-git-daemon.sh: use the $( ... ) construct for command substitution
553
- + t/t5550-http-fetch-dumb.sh: use the $( ... ) construct for command substitution
554
- + t/t5538-push-shallow.sh: use the $( ... ) construct for command substitution
555
- + t/t5537-fetch-shallow.sh: use the $( ... ) construct for command substitution
556
- + t/t5532-fetch-proxy.sh: use the $( ... ) construct for command substitution
557
- + t/t5530-upload-pack-error.sh: use the $( ... ) construct for command substitution
558
- + t/t5522-pull-symlink.sh: use the $( ... ) construct for command substitution
559
- + t/t5517-push-mirror.sh: use the $( ... ) construct for command substitution
560
- + t/t5516-fetch-push.sh: use the $( ... ) construct for command substitution
561
- + t/t5515-fetch-merge-logic.sh: use the $( ... ) construct for command substitution
562
- + t/t5510-fetch.sh: use the $( ... ) construct for command substitution
563
- + t/t5506-remote-groups.sh: use the $( ... ) construct for command substitution
564
- + t/t5505-remote.sh: use the $( ... ) construct for command substitution
565
- + t/t5500-fetch-pack.sh: use the $( ... ) construct for command substitution
566
- + t/t5305-include-tag.sh: use the $( ... ) construct for command substitution
567
- + t/t5304-prune.sh: use the $( ... ) construct for command substitution
568
- + t/t5303-pack-corruption-resilience.sh: use the $( ... ) construct for command substitution
569
- + t/t5100: no need to use 'echo' command substitutions for globbing
570
- + t/t5302-pack-index.sh: use the $( ... ) construct for command substitution
571
- + t/t5301-sliding-window.sh: use the $( ... ) construct for command substitution
572
- + t/t5300-pack-object.sh: use the $( ... ) construct for command substitution
573
- + t/t5100-mailinfo.sh: use the $( ... ) construct for command substitution
574
- + t/t3700-add.sh: use the $( ... ) construct for command substitution
575
- + t/t3600-rm.sh: use the $( ... ) construct for command substitution
576
- + t/t3511-cherry-pick-x.sh: use the $( ... ) construct for command substitution
577
- + t/t3403-rebase-skip.sh: use the $( ... ) construct for command substitution
578
- + t/t3210-pack-refs.sh: use the $( ... ) construct for command substitution
579
- + t/t3101-ls-tree-dirname.sh: use the $( ... ) construct for command substitution
580
- + t/t3100-ls-tree-restrict.sh: use the $( ... ) construct for command substitution
581
- + t/t3030-merge-recursive.sh: use the $( ... ) construct for command substitution
582
- + t/t2102-update-index-symlinks.sh: use the $( ... ) construct for command substitution
583
- + t/t2025-worktree-add.sh: use the $( ... ) construct for command substitution
584
- + t/t1700-split-index.sh: use the $( ... ) construct for command substitution
585
- + t/t1512-rev-parse-disambiguation.sh: use the $( ... ) construct for command substitution
586
- + t/t1511-rev-parse-caret.sh: use the $( ... ) construct for command substitution
587
- + t/t1410-reflog.sh: use the $( ... ) construct for command substitution
588
- + t/t1401-symbolic-ref.sh: use the $( ... ) construct for command substitution
589
- + t/t1100-commit-tree-options.sh: use the $( ... ) construct for command substitution
590
- + unimplemented.sh: use the $( ... ) construct for command substitution
591
- + test-sha1.sh: use the $( ... ) construct for command substitution
592
- + t/lib-httpd.sh: use the $( ... ) construct for command substitution
593
- + git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
594
- + contrib/thunderbird-patch-inline/appp.sh: use the $( ... ) construct for command substitution
595
- + contrib/examples/git-revert.sh: use the $( ... ) construct for command substitution
596
- + contrib/examples/git-repack.sh: use the $( ... ) construct for command substitution
597
- + contrib/examples/git-merge.sh: use the $( ... ) construct for command substitution
598
- + contrib/examples/git-fetch.sh: use the $( ... ) construct for command substitution
599
- + contrib/examples/git-commit.sh: use the $( ... ) construct for command substitution
600
-
601
- A shell script style update to change `command substitution` into
602
- $(command substitution). Coverts contrib/ and much of the t/
603
- directory contents.
604
-
605
- Will merge to 'master'.
606
-
607
-
608
-* cc/untracked (2016-01-20) 11 commits
598
+* cc/untracked (2016-01-25) 11 commits
599
- t7063: add tests for core.untrackedCache
600
- test-dump-untracked-cache: don't modify the untracked cache
601
- config: add core.untrackedCache
@@ -655,47 +645,41 @@ repositories listed at
645
646
647
* dw/subtree-split-do-not-drop-merge (2016-01-20) 1 commit
658
- - contrib/subtree: fix "subtree split" skipped-merge bug
648
+ (merged to 'next' on 2016-01-26 at 3cfefef)
649
+ + contrib/subtree: fix "subtree split" skipped-merge bug
650
651
The "split" subcommand of "git subtree" (in contrib/) incorrectly
652
skipped merges when it shouldn't, which was corrected.
653
663
- Will merge to 'next'.
654
+ Will merge to 'master'.
655
656
657
* kn/ref-filter-atom-parsing (2016-01-05) 15 commits
667
- - ref-filter: introduce objectname_atom_parser()
668
- - ref-filter: introduce contents_atom_parser()
669
- - ref-filter: introduce remote_ref_atom_parser()
670
- - ref-filter: align: introduce long-form syntax
671
- - ref-filter: convert variable 'width' to an unsigned int
672
- - ref-filter: introduce parse_align_position()
673
- - ref-filter: introduce align_atom_parser()
674
- - ref-filter: introduce color_atom_parser()
675
- - ref-filter: skip deref specifier in match_atom_name()
676
- - ref-fitler: bump match_atom() name to the top
677
- - ref-filter: introduce parsing functions for each valid atom
678
- - ref-filter: introduce struct used_atom
679
- - ref-filter: bump 'used_atom' and related code to the top
680
- - ref-filter: use strbuf_split_str_omit_term()
681
- - strbuf: introduce strbuf_split_str_omit_term()
658
+ . ref-filter: introduce objectname_atom_parser()
659
+ . ref-filter: introduce contents_atom_parser()
660
+ . ref-filter: introduce remote_ref_atom_parser()
661
+ . ref-filter: align: introduce long-form syntax
662
+ . ref-filter: convert variable 'width' to an unsigned int
663
+ . ref-filter: introduce parse_align_position()
664
+ . ref-filter: introduce align_atom_parser()
665
+ . ref-filter: introduce color_atom_parser()
666
+ . ref-filter: skip deref specifier in match_atom_name()
667
+ . ref-fitler: bump match_atom() name to the top
668
+ . ref-filter: introduce parsing functions for each valid atom
669
+ . ref-filter: introduce struct used_atom
670
+ . ref-filter: bump 'used_atom' and related code to the top
671
+ . ref-filter: use strbuf_split_str_omit_term()
672
+ . strbuf: introduce strbuf_split_str_omit_term()
673
674
Refactoring of ref-filter's format-parsing code, in preparation
675
for "branch --format" and friends.
676
686
- This replaces (for now) kn/for-each-ref-remainder, which will be built
687
- on top.
688
-
689
- Still being discussed and worked on.
690
-
691
-
692
-* bb/merge-marker-crlf (2015-11-24) 1 commit
693
- - merge-file: consider core.crlf when writing merge markers
677
+ Ejected as this will need to be rerolled on top of regression fix
678
+ for "git tag" that started sharing the internal machinery with
679
+ ref-filter that happened in v2.7.0.
680
695
- Write out merge markers using system end-of-line convention.
696
-
697
- Waiting for a re-roll to handle gitattributes.
698
- ($gmane/281701)
681
+ Needs reroll.
682
+ ($gmane/284776).
683
684
685
* dk/gc-more-wo-pack (2016-01-13) 4 commits
@@ -711,38 +695,13 @@ repositories listed at
695
($gmane/284368).
696
697
714
-* rm/subtree-unwrap-tags (2015-11-24) 1 commit
715
- (merged to 'next' on 2016-01-20 at 6373d95)
716
- + contrib/subtree: unwrap tag refs
717
-
718
- "git subtree" (in contrib/) records the tag object name in the
719
- commit log message when a subtree is added using a tag, without
720
- peeling it down to the underlying commit. The tag needs to be
721
- peeled when "git subtree split" wants to work on the commit, but
722
- the command forgot to do so.
723
-
724
- Will merge to 'master'.
725
-
726
-
727
-* sg/sh-require-clean-orphan (2015-11-24) 2 commits
728
- - sh-setup: make require_clean_work_tree() work on orphan branches
729
- - Add tests for git-sh-setup's require_clean_work_tree()
730
-
731
- Allow users of git-sh-setup to handle orphan branch state.
732
-
733
- This series takes the conservative route of requiring scripts to opt
734
- into the looser behavior, at the expense of carrying around a new
735
- option-flag forever. I'm not sure if we need to do so.
736
-
737
- Needs review.
738
-
739
-
698
* tb/ls-files-eol (2016-01-18) 1 commit
741
- - ls-files: add eol diagnostics
699
+ (merged to 'next' on 2016-01-26 at bc9246f)
700
+ + ls-files: add eol diagnostics
701
702
Add options to ls-files to help diagnose end-of-line problems.
703
745
- Will merge to 'next'.
704
+ Will merge to 'master'.
705
706
707
* ec/annotate-deleted (2015-11-20) 1 commit
@@ -772,20 +731,21 @@ repositories listed at
731
732
733
* jc/strbuf-getline (2016-01-15) 9 commits
775
- - strbuf: give strbuf_getline() to the "most text friendly" variant
776
- - checkout-index: there are only two possible line terminations
777
- - update-index: there are only two possible line terminations
778
- - check-ignore: there are only two possible line terminations
779
- - check-attr: there are only two possible line terminations
780
- - mktree: there are only two possible line terminations
781
- - strbuf: introduce strbuf_getline_{lf,nul}()
782
- - strbuf: make strbuf_getline_crlf() global
783
- - strbuf: miniscule style fix
734
+ (merged to 'next' on 2016-01-22 at 8c4e051)
735
+ + strbuf: give strbuf_getline() to the "most text friendly" variant
736
+ + checkout-index: there are only two possible line terminations
737
+ + update-index: there are only two possible line terminations
738
+ + check-ignore: there are only two possible line terminations
739
+ + check-attr: there are only two possible line terminations
740
+ + mktree: there are only two possible line terminations
741
+ + strbuf: introduce strbuf_getline_{lf,nul}()
742
+ + strbuf: make strbuf_getline_crlf() global
743
+ + strbuf: miniscule style fix
744
(this branch is used by jc/peace-with-crlf.)
745
746
The preliminary clean-up for jc/peace-with-crlf topic.
747
788
- Will merge to 'next'.
748
+ Will merge to 'master'.
749
750
751
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
@@ -818,7 +778,7 @@ repositories listed at
778
($gmane/275680).
779
780
821
-* jc/rerere-multi (2015-09-14) 7 commits
781
+* jc/rerere-multi (2016-01-21) 7 commits
782
- rerere: do use multiple variants
783
- t4200: rerere a merge with two identical conflicts
784
- rerere: allow multiple variants to exist
@@ -831,7 +791,7 @@ repositories listed at
791
signature that have to be resolved in different ways, but there was
792
no way to record these separate resolutions.
793
834
- Needs review.
794
+ Needs further work on forget/gc.
795
796
797
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
@@ -842,3 +802,19 @@ repositories listed at
802
git-gui still uses the deprecated syntax, which needs to be fixed
803
before this final step can proceed.
804
($gmane/282594)
805
+
806
+--------------------------------------------------
807
+[Discarded]
808
+
809
+* bb/merge-marker-crlf (2015-11-24) 1 commit
810
+ . merge-file: consider core.crlf when writing merge markers
811
+
812
+ Resurrected as 'js/xmerge-maker-eol'.
813
+
814
+
815
+* sg/sh-require-clean-orphan (2015-11-24) 2 commits
816
+ . sh-setup: make require_clean_work_tree() work on orphan branches
817
+ . Add tests for git-sh-setup's require_clean_work_tree()
818
+
819
+ Allow users of git-sh-setup to handle orphan branch state.
820
+ ($gmane/284488)