What's cooking (2013/06 #01)
Junio C Hamano committed
Jun 2, 2013 at 16:55 UTC
6e6563c73f558d3819fc67ddb670bd612ef577a3
1 file changed
+272
-465
whats-cooking.txt
+272
-465
@@ -1,26 +1,24 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2013, #09; Wed, 29)
4
-X-master-at: 727a46b2f9a1ce69eaf09bc46cb129f1c40833d8
5
-X-next-at: f3f2a46de0016cbb91a672fc1179759b6ad9a32c
3
+Subject: What's cooking in git.git (Jun 2013, #01; Sun, 2)
4
+X-master-at: b2edae0ab6d8188d6cd912ba5c8d1f2086c2cb9a
5
+X-next-at: 88ee588a4065fc39b2b849219c7dd2eb139932c5
6
7
-What's cooking in git.git (May 2013, #09; Wed, 29)
7
+What's cooking in git.git (Jun 2013, #01; Sun, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-Usually I avoid issuing "What's cooking" back-to-back, but because I
15
-will be offline for a few days, here is a snapshot of tonight's
16
-status.
14
+Many topics that have been cooking in 'next' from the previous cycle
15
+have now graduated to 'master', so the RelNotes have been updated
16
+again.
17
18
-Some topics that have been cooking in 'next' from the previous cycle
19
-have now graduated to 'master', so the RelNotes have been updated.
20
-
21
-Nothing new in 'next', and it has not been rewound yet, which will
22
-hopefully happen this weekend, and after that post 1.8.3 cycle
23
-really starts.
18
+Nothing really new in 'next' except for one, and it has not been
19
+rewound yet, which will hopefully happen tomorrow, and after that
20
+post 1.8.3 cycle really starts. I haven't caught up all the series
21
+posted during the past few days.
22
23
Also a rather serious regression on path-exclusion logic (most
24
notably seen in .gitignore) has been found and quickly patched (it
@@ -34,247 +32,228 @@ of the repositories listed at
32
--------------------------------------------------
33
[Graduated to "master"]
34
37
-* as/check-ignore (2013-04-29) 6 commits
38
- (merged to 'next' on 2013-04-30 at 646931f)
39
- + t0008: use named pipe (FIFO) to test check-ignore streaming
40
- (merged to 'next' on 2013-04-21 at 7515aa8)
41
- + Documentation: add caveats about I/O buffering for check-{attr,ignore}
42
- + check-ignore: allow incremental streaming of queries via --stdin
43
- + check-ignore: move setup into cmd_check_ignore()
44
- + check-ignore: add -n / --non-matching option
45
- + t0008: remove duplicated test fixture data
46
-
47
- Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
48
- over bidi-pipes.
49
-
50
-
51
-* fc/transport-helper-error-reporting (2013-05-10) 12 commits
52
- (merged to 'next' on 2013-05-10 at 2a9af4b)
53
- + transport-helper: fix remote helper namespace regression
54
- + test: remote-helper: add missing and
55
- (merged to 'next' on 2013-04-25 at 3358f1a)
56
- + t5801: "VAR=VAL shell_func args" is forbidden
57
- (merged to 'next' on 2013-04-22 at 5ba6467)
58
- + transport-helper: update remote helper namespace
59
- + transport-helper: trivial code shuffle
60
- + transport-helper: warn when refspec is not used
61
- + transport-helper: clarify pushing without refspecs
62
- + transport-helper: update refspec documentation
63
- + transport-helper: clarify *:* refspec
64
- + transport-helper: improve push messages
65
- + transport-helper: mention helper name when it dies
66
- + transport-helper: report errors properly
67
- (this branch is tangled with js/transport-helper-error-reporting-fix.)
68
-
69
- Update transport helper to report errors and maintain ref hierarchy
70
- used to keep track of remote helper state better.
71
-
72
-
73
-* jc/prune-all (2013-04-25) 4 commits
74
- (merged to 'next' on 2013-04-26 at 97a7387)
75
- + prune: introduce OPT_EXPIRY_DATE() and use it
76
- (merged to 'next' on 2013-04-22 at b00ccf6)
77
- + api-parse-options.txt: document "no-" for non-boolean options
78
- + git-gc.txt, git-reflog.txt: document new expiry options
79
- + date.c: add parse_expiry_date()
80
- (this branch is used by mh/packed-refs-various.)
81
-
82
- We used the approxidate() parser for "--expire=<timestamp>" options
83
- of various commands, but it is better to treat --expire=all and
84
- --expire=now a bit more specially than using the current timestamp.
85
- Update "git gc" and "git reflog" with a new parsing function for
86
- expiry dates.
87
-
88
-
89
-* jh/checkout-auto-tracking (2013-04-21) 8 commits
90
- (merged to 'next' on 2013-04-22 at 2356700)
91
- + glossary: Update and rephrase the definition of a remote-tracking branch
92
- + branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
93
- + t9114.2: Don't use --track option against "svn-remote"-tracking branches
94
- + t7201.24: Add refspec to keep --track working
95
- + t3200.39: tracking setup should fail if there is no matching refspec.
96
- + checkout: Use remote refspecs when DWIMming tracking branches
97
- + t2024: Show failure to use refspec when DWIMming remote branch names
98
- + t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'
99
-
100
- Updates "git checkout foo" that DWIMs the intended "upstream" and
101
- turns it into "git checkout -t -b foo remotes/origin/foo" to
102
- correctly take existing remote definitions into account. The
103
- remote "origin" may be what uniquely map its own branch to
104
- remotes/some/where/foo but that some/where may not be "origin".
105
-
106
-
107
-* jk/lookup-object-prefer-latest (2013-05-02) 1 commit
108
- (merged to 'next' on 2013-05-06 at cc59dcc)
109
- + lookup_object: prioritize recently found objects
110
-
111
- Optimizes object lookup when the object hashtable starts to become
112
- crowded.
113
-
114
-
115
-* jk/subtree-do-not-push-if-split-fails (2013-05-01) 1 commit
116
- (merged to 'next' on 2013-05-06 at 81bdf37)
117
- + contrib/subtree: don't delete remote branches if split fails
118
-
119
- "git subtree" (in contrib/) had one codepath with loose error
120
- checks to lose data at the remote side.
121
-
122
-
123
-* jk/test-output (2013-05-06) 3 commits
124
- (merged to 'next' on 2013-05-06 at 7c03af3)
125
- + t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively
126
- (merged to 'next' on 2013-05-01 at 63827c9)
127
- + test output: respect $TEST_OUTPUT_DIRECTORY
128
- + t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY
129
-
130
- When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat
131
- inconsistently between the test framework and t/Makefile, and logic
132
- to summarize the results looked at a wrong place.
133
-
134
-
135
-* jn/config-ignore-inaccessible (2013-04-15) 1 commit
136
- (merged to 'next' on 2013-05-07 at 4f09e24)
137
- + config: allow inaccessible configuration under $HOME
138
-
139
- When $HOME is misconfigured to point at an unreadable directory, we
140
- used to complain and die. This loosens the check.
141
-
142
-
143
-* js/transport-helper-error-reporting-fix (2013-04-28) 13 commits
144
- (merged to 'next' on 2013-04-29 at 8cc4bb8)
145
- + git-remote-testgit: build it to run under $SHELL_PATH
146
- + git-remote-testgit: further remove some bashisms
147
- + git-remote-testgit: avoid process substitution
148
- (merged to 'next' on 2013-04-25 at 3358f1a)
149
- + t5801: "VAR=VAL shell_func args" is forbidden
150
- (merged to 'next' on 2013-04-22 at 5ba6467)
151
- + transport-helper: update remote helper namespace
152
- + transport-helper: trivial code shuffle
153
- + transport-helper: warn when refspec is not used
154
- + transport-helper: clarify pushing without refspecs
155
- + transport-helper: update refspec documentation
156
- + transport-helper: clarify *:* refspec
157
- + transport-helper: improve push messages
158
- + transport-helper: mention helper name when it dies
159
- + transport-helper: report errors properly
160
- (this branch is tangled with fc/transport-helper-error-reporting.)
161
-
162
- Finishing touches to fc/transport-helper-error-reporting topic.
163
-
164
-
165
-* mh/fetch-into-shallow (2013-05-02) 2 commits
166
- (merged to 'next' on 2013-05-03 at 3fadc61)
167
- + t5500: add test for fetching with an unknown 'shallow'
168
- (merged to 'next' on 2013-04-29 at a167d3e)
169
- + upload-pack: ignore 'shallow' lines with unknown obj-ids
170
-
171
-
172
-* mh/packed-refs-various (2013-05-01) 33 commits
173
- (merged to 'next' on 2013-05-01 at e527153)
174
- + refs: handle the main ref_cache specially
175
- + refs: change do_for_each_*() functions to take ref_cache arguments
176
- + pack_one_ref(): do some cheap tests before a more expensive one
177
- + pack_one_ref(): use write_packed_entry() to do the writing
178
- + pack_one_ref(): use function peel_entry()
179
- + refs: inline function do_not_prune()
180
- + pack_refs(): change to use do_for_each_entry()
181
- + refs: use same lock_file object for both ref-packing functions
182
- + pack_one_ref(): rename "path" parameter to "refname"
183
- + pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
184
- + pack-refs: rename handle_one_ref() to pack_one_ref()
185
- + refs: extract a function write_packed_entry()
186
- + repack_without_ref(): write peeled refs in the rewritten file
187
- + t3211: demonstrate loss of peeled refs if a packed ref is deleted
188
- + refs: change how packed refs are deleted
189
- + search_ref_dir(): return an index rather than a pointer
190
- + repack_without_ref(): silence errors for dangling packed refs
191
- + t3210: test for spurious error messages for dangling packed refs
192
- + refs: change the internal reference-iteration API
193
- + refs: extract a function peel_entry()
194
- + peel_ref(): fix return value for non-peelable, not-current reference
195
- + peel_object(): give more specific information in return value
196
- + refs: extract function peel_object()
197
- + refs: extract a function ref_resolves_to_object()
198
- + repack_without_ref(): use function get_packed_ref()
199
- + peel_ref(): use function get_packed_ref()
200
- + get_packed_ref(): return a ref_entry
201
- + do_for_each_ref_in_dirs(): remove dead code
202
- + refs: define constant PEELED_LINE_LENGTH
203
- + refs: document how current_ref is used
204
- + refs: document do_for_each_ref() and do_one_ref()
205
- + refs: document the fields of struct ref_value
206
- + refs: document flags constants REF_*
207
- (this branch uses jc/prune-all.)
208
-
209
- Updates reading and updating packed-refs file, correcting corner
210
- case bugs.
211
-
212
-
213
-* rj/sparse (2013-04-28) 10 commits
214
- (merged to 'next' on 2013-05-01 at 649e16c)
215
- + sparse: Fix mingw_main() argument number/type errors
216
- + compat/mingw.c: Fix some sparse warnings
217
- + compat/win32mmap.c: Fix some sparse warnings
218
- + compat/poll/poll.c: Fix a sparse warning
219
- + compat/win32/pthread.c: Fix a sparse warning
220
- + compat/unsetenv.c: Fix a sparse warning
221
- + compat/nedmalloc: Fix compiler warnings on linux
222
- + compat/nedmalloc: Fix some sparse warnings
223
- + compat/fnmatch/fnmatch.c: Fix a sparse error
224
- + compat/regex/regexec.c: Fix some sparse warnings
35
+* an/diff-index-doc (2013-05-20) 1 commit
36
+ (merged to 'next' on 2013-05-21 at 6e1459b)
37
+ + Documentation/diff-index: mention two modes of operation
38
226
---------------------------------------------------
227
-[New Topics]
39
229
-* ap/diff-ignore-blank-lines (2013-05-29) 1 commit
230
- - diff: add --ignore-blank-lines option
40
+* da/darwin (2013-05-21) 4 commits
41
+ (merged to 'next' on 2013-05-21 at 0497edb)
42
+ + imap-send: eliminate HMAC deprecation warnings on Mac OS X
43
+ + cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
44
+ + Makefile: add support for Apple CommonCrypto facility
45
+ + Makefile: fix default regex settings on Darwin
46
232
- "git diff" learned a mode that ignores hunks whose change consists
233
- only of additions and removals of blank lines, which is the same as
234
- "diff -B" (ignore blank lines) of GNU diff.
47
+ Newer MacOS X encourages the programs to compile and link with
48
+ their CommonCrypto, not with OpenSSL.
49
50
237
-* fc/show-branch-in-rebase-am (2013-05-29) 1 commit
238
- - prompt: fix for simple rebase
51
+* fc/completion (2013-04-27) 9 commits
52
+ (merged to 'next' on 2013-05-21 at aba6ef1)
53
+ + completion: remove __git_index_file_list_filter()
54
+ + completion: add space after completed filename
55
+ + completion: add hack to enable file mode in bash < 4
56
+ + completion: refactor __git_complete_index_file()
57
+ + completion: refactor diff_index wrappers
58
+ + completion: use __gitcompadd for __gitcomp_file
59
+ + completion; remove unuseful comments
60
+ + completion: document tilde expansion failure in tests
61
+ + completion: add file completion tests
62
240
- The bash prompt code (in contrib/) displayed the name of the branch
241
- being rebased when "rebase -i/-m/-p" modes are in use, but not the
242
- plain vanilla "rebase".
63
244
- Will merge to 'next'.
64
+* fc/fast-export-persistent-marks (2013-05-07) 3 commits
65
+ (merged to 'next' on 2013-05-21 at 10b8214)
66
+ + fast-{import,export}: use get_sha1_hex() to read from marks file
67
+ + fast-export: don't parse commits while reading marks file
68
+ + fast-export: do not parse non-commit objects while reading marks file
69
70
+ Optimization for fast-export by avoiding unnecessarily resolving
71
+ arbitrary object name and parsing object when only presence and
72
+ type information is necessary, etc.
73
247
-* kb/status-ignored-optim-2 (2013-05-29) 1 commit
248
- - dir.c: fix ignore processing within not-ignored directories
74
250
- Fix 1.8.3 regressions in the .gitignore path exclusion logic.
75
+* fc/macos-x-clipped-write (2013-05-17) 1 commit
76
+ (merged to 'next' on 2013-05-21 at 510b0dd)
77
+ + compate/clipped-write.c: large write(2) fails on Mac OS X/XNU
78
79
+ Mac OS X does not like to write(2) more than INT_MAX number of
80
+ bytes.
81
253
-* ks/difftool-dir-diff-copy-fix (2013-05-29) 1 commit
254
- - difftool --dir-diff: allow changing any clean working tree file
82
256
- "difftool --dir-diff" did not copy back changes made by the
257
- end-user in the diff tool backend to the working tree in some
258
- cases.
83
+* fc/zsh-leftover-bits (2013-05-29) 3 commits
84
+ (merged to 'next' on 2013-05-29 at b367b4e)
85
+ + completion: zsh: improve bash script loading
86
+ (merged to 'next' on 2013-05-21 at 1b84ec1)
87
+ + completion: synchronize zsh wrapper
88
+ + completion: cleanup zsh wrapper
89
90
261
-* rr/push-head (2013-05-29) 3 commits
262
- - push: make push.default = current use resolved HEAD
263
- - push: fail early with detached HEAD and current
264
- - push: factor out the detached HEAD error message
91
+* jc/strbuf-branchname-fix (2013-05-16) 1 commit
92
+ (merged to 'next' on 2013-05-21 at 5db8872)
93
+ + strbuf_branchname(): do not double-expand @{-1}~22
94
266
- "git push $there HEAD:branch" did not resolve HEAD early enough, so
267
- it was easy to flip it around while push is still going on and push
268
- out a branch that the user did not originally intended when the
269
- command was started.
95
+ "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"
96
+ incorrectly when your previous branch was "frotz" (it should be
97
+ rewritten to "git merge frotz~22" instead).
98
271
- Will merge to 'next'.
99
100
+* jc/t5551-posix-sed-bre (2013-05-12) 1 commit
101
+ (merged to 'next' on 2013-05-21 at d597ca1)
102
+ + t5551: do not use unportable sed '\+'
103
274
-* sb/archive-zip-double-assignment-fix (2013-05-29) 1 commit
275
- - archive-zip:write_zip_entry: Remove second reset of size variable to zero.
104
+ POSIX fix for a test script.
105
277
- Will merge to 'next'.
106
+
107
+* jk/fetch-always-update-tracking (2013-05-28) 5 commits
108
+ (merged to 'next' on 2013-05-28 at c6abf3f)
109
+ + fetch: don't try to update unfetched tracking refs
110
+ (merged to 'next' on 2013-05-21 at f7e4b16)
111
+ + fetch: opportunistically update tracking refs
112
+ + refactor "ref->merge" flag
113
+ + fetch/pull doc: untangle meaning of bare <ref>
114
+ + t5510: start tracking-ref tests from a known state
115
+
116
+ "git fetch origin master" unlike "git fetch origin" or "git fetch"
117
+ does not update "refs/remotes/origin/master" and it was an early
118
+ design decision to keep the update of remote tracking branches
119
+ predictable, but in practice it turns out that people find it more
120
+ convenient to opportunisticly update them whenever we have a
121
+ chance, and we have been updating them when we run "git push" which
122
+ already breaks the original "predictability" anyway.
123
+
124
+
125
+* kb/ancestry-path-threedots (2013-05-16) 2 commits
126
+ (merged to 'next' on 2013-05-21 at 5d75bd3)
127
+ + revision.c: treat A...B merge bases as if manually specified
128
+ + t6019: demonstrate --ancestry-path A...B breakage
129
+ (this branch is used by kb/full-history-compute-treesame-carefully-2.)
130
+
131
+ "git log --ancestry-path A...B" did not work as expected, as it did
132
+ not pay attention to the fact that the merge base between A and B
133
+ was the bottom of the range being specified.
134
+
135
+
136
+* mc/describe-first-parent (2013-05-20) 1 commit
137
+ (merged to 'next' on 2013-05-21 at 2e02ffc)
138
+ + describe: Add --first-parent option
139
+
140
+
141
+* mk/combine-diff-context-horizon-fix (2013-05-15) 1 commit
142
+ (merged to 'next' on 2013-05-21 at f462c02)
143
+ + combine-diff.c: Fix output when changes are exactly 3 lines apart
144
+
145
+ "git diff -c -p" was not showing a deleted line from a hunk when
146
+ another hunk immediately begins where the earlier one ends.
147
+
148
+
149
+* nd/clone-local-with-colon (2013-05-07) 1 commit
150
+ (merged to 'next' on 2013-05-21 at 3e293bd)
151
+ + clone: allow cloning local paths with colons in them
152
+
153
+ "git clone foo/bar:baz" cannot be a request to clone from a remote
154
+ over git-over-ssh specified in the scp style. Detect this case and
155
+ clone from a local repository at "foo/bar:baz".
156
+
157
+
158
+* rh/merge-options-doc-fix (2013-05-16) 1 commit
159
+ (merged to 'next' on 2013-05-21 at f76baf3)
160
+ + Documentation/merge-options.txt: restore `-e` option
161
+
162
+
163
+* rs/empty-archive (2013-05-09) 2 commits
164
+ (merged to 'next' on 2013-05-21 at 3e9e288)
165
+ + t5004: resurrect original empty tar archive test
166
+ + t5004: avoid using tar for checking emptiness of archive
167
+
168
+ Fixes tests added in 1.8.2 era that are broken on BSDs.
169
+
170
+
171
+* rs/tar-tests (2013-05-20) 6 commits
172
+ (merged to 'next' on 2013-05-21 at aed12a7)
173
+ + t5000: test long filenames
174
+ + t5000: simplify tar-tree tests
175
+ + t5000: use check_tar for prefix test
176
+ + t5000: factor out check_tar
177
+ + t5000, t5003: create directories for extracted files lazily
178
+ + t5000: integrate export-subst tests into regular tests
179
+
180
+
181
+* tr/coverage (2013-05-13) 4 commits
182
+ (merged to 'next' on 2013-05-21 at 8480007)
183
+ + coverage: build coverage-untested-functions by default
184
+ + coverage: set DEFAULT_TEST_TARGET to avoid using prove
185
+ + coverage: do not delete .gcno files before building
186
+ + coverage: split build target into compile and test
187
+
188
+ Update the test coverage support that was left to bitrot for some
189
+ time.
190
+
191
+
192
+* tr/line-log (2013-04-22) 13 commits
193
+ (merged to 'next' on 2013-04-22 at 8f2c1de)
194
+ + git-log(1): remove --full-line-diff description
195
+ (merged to 'next' on 2013-04-21 at cd92620)
196
+ + line-log: fix documentation formatting
197
+ (merged to 'next' on 2013-04-15 at 504559e)
198
+ + log -L: improve comments in process_all_files()
199
+ + log -L: store the path instead of a diff_filespec
200
+ + log -L: test merge of parallel modify/rename
201
+ + t4211: pass -M to 'git log -M -L...' test
202
+ (merged to 'next' on 2013-04-05 at 5afb00c)
203
+ + log -L: fix overlapping input ranges
204
+ + log -L: check range set invariants when we look it up
205
+ (merged to 'next' on 2013-04-01 at 5be920c)
206
+ + Speed up log -L... -M
207
+ + log -L: :pattern:file syntax to find by funcname
208
+ + Implement line-history search (git log -L)
209
+ + Export rewrite_parents() for 'log -L'
210
+ + Refactor parse_loc
211
+
212
+
213
+* vv/help-unknown-ref (2013-05-08) 2 commits
214
+ (merged to 'next' on 2013-05-21 at 77a2941)
215
+ + merge: use help_unknown_ref()
216
+ + help: add help_unknown_ref()
217
+
218
+ Detect "git merge foo" that might have meant "git merge origin/foo"
219
+ and give an error message that is more specific than "foo is not
220
+ something we can merge".
221
+
222
+--------------------------------------------------
223
+[New Topics]
224
+
225
+* ap/wildmatch-foldcase (2013-06-02) 1 commit
226
+ - wildmatch: properly fold case everywhere
227
+
228
+
229
+* fc/completion-less-ls-remote (2013-06-02) 1 commit
230
+ - completion: avoid ls-remote in certain scenarios
231
+
232
+
233
+* jk/test-exit-code-by-signal (2013-06-02) 1 commit
234
+ - t0005: test git exit code from signal death
235
+
236
+
237
+* nd/make-wildmatch-default (2013-06-02) 1 commit
238
+ - Makefile: promote wildmatch to be the default fnmatch implementation
239
+
240
+
241
+* rr/remove-contrib-some (2013-06-02) 1 commit
242
+ - contrib: remove continuous/ and patches/
243
+
244
+
245
+* rs/unpack-trees-plug-leak (2013-06-02) 7 commits
246
+ - unpack-trees: free cache_entry array members for merges
247
+ - diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
248
+ - diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
249
+ - unpack-trees: create working copy of merge entry in merged_entry
250
+ - unpack-trees: factor out dup_entry
251
+ - read-cache: mark cache_entry pointers const
252
+ - cache: mark cache_entry pointers const
253
+
254
+
255
+* tr/test-commit-only-on-orphan (2013-06-02) 1 commit
256
+ - Test 'commit --only' after 'checkout --orphan'
257
258
--------------------------------------------------
259
[Stalled]
@@ -331,6 +310,7 @@ of the repositories listed at
310
Will discard unless we hear from anybody who is interested in
311
tying its loose ends.
312
313
+
314
* jk/commit-info-slab (2013-04-19) 3 commits
315
- commit-slab: introduce a macro to define a slab for new type
316
- commit-slab: avoid large realloc
@@ -343,6 +323,60 @@ of the repositories listed at
323
--------------------------------------------------
324
[Cooking]
325
326
+* ap/diff-ignore-blank-lines (2013-05-29) 1 commit
327
+ - diff: add --ignore-blank-lines option
328
+
329
+ "git diff" learned a mode that ignores hunks whose change consists
330
+ only of additions and removals of blank lines, which is the same as
331
+ "diff -B" (ignore blank lines) of GNU diff.
332
+
333
+
334
+* fc/show-branch-in-rebase-am (2013-05-29) 1 commit
335
+ - prompt: fix for simple rebase
336
+
337
+ The bash prompt code (in contrib/) displayed the name of the branch
338
+ being rebased when "rebase -i/-m/-p" modes are in use, but not the
339
+ plain vanilla "rebase".
340
+
341
+ Will merge to 'next'.
342
+
343
+
344
+* kb/status-ignored-optim-2 (2013-06-02) 1 commit
345
+ (merged to 'next' on 2013-06-02 at 88ee588)
346
+ + dir.c: fix ignore processing within not-ignored directories
347
+
348
+ Fix 1.8.3 regressions in the .gitignore path exclusion logic.
349
+
350
+ Will merge to 'master'.
351
+
352
+
353
+* ks/difftool-dir-diff-copy-fix (2013-05-29) 1 commit
354
+ - difftool --dir-diff: allow changing any clean working tree file
355
+
356
+ "difftool --dir-diff" did not copy back changes made by the
357
+ end-user in the diff tool backend to the working tree in some
358
+ cases.
359
+
360
+
361
+* rr/push-head (2013-05-29) 3 commits
362
+ - push: make push.default = current use resolved HEAD
363
+ - push: fail early with detached HEAD and current
364
+ - push: factor out the detached HEAD error message
365
+
366
+ "git push $there HEAD:branch" did not resolve HEAD early enough, so
367
+ it was easy to flip it around while push is still going on and push
368
+ out a branch that the user did not originally intended when the
369
+ command was started.
370
+
371
+ Will merge to 'next'.
372
+
373
+
374
+* sb/archive-zip-double-assignment-fix (2013-05-29) 1 commit
375
+ - archive-zip:write_zip_entry: Remove second reset of size variable to zero.
376
+
377
+ Will merge to 'next'.
378
+
379
+
380
* rj/mingw-cygwin (2013-05-08) 2 commits
381
- cygwin: Remove the CYGWIN_V15_WIN32API build variable
382
- mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
@@ -350,7 +384,7 @@ of the repositories listed at
384
Update build for Cygwin 1.[57]. Torsten Bögershausen reports that
385
this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
386
ahead.
353
-
387
+
388
Will merge to 'next'.
389
390
@@ -435,7 +469,7 @@ of the repositories listed at
469
Will merge to 'next'.
470
471
438
-* rj/mingw-compat-st-mode-bits (2013-05-28) 1 commit
472
+* rj/mingw-compat-st-mode-bits (2013-05-29) 1 commit
473
- path: Fix a sparse warning
474
475
Will merge to 'next'.
@@ -460,30 +494,7 @@ of the repositories listed at
494
Will merge to 'next'.
495
496
463
-* tr/line-log (2013-04-22) 13 commits
464
- (merged to 'next' on 2013-04-22 at 8f2c1de)
465
- + git-log(1): remove --full-line-diff description
466
- (merged to 'next' on 2013-04-21 at cd92620)
467
- + line-log: fix documentation formatting
468
- (merged to 'next' on 2013-04-15 at 504559e)
469
- + log -L: improve comments in process_all_files()
470
- + log -L: store the path instead of a diff_filespec
471
- + log -L: test merge of parallel modify/rename
472
- + t4211: pass -M to 'git log -M -L...' test
473
- (merged to 'next' on 2013-04-05 at 5afb00c)
474
- + log -L: fix overlapping input ranges
475
- + log -L: check range set invariants when we look it up
476
- (merged to 'next' on 2013-04-01 at 5be920c)
477
- + Speed up log -L... -M
478
- + log -L: :pattern:file syntax to find by funcname
479
- + Implement line-history search (git log -L)
480
- + Export rewrite_parents() for 'log -L'
481
- + Refactor parse_loc
482
-
483
- Will merge to 'master'.
484
-
485
-
486
-* mh/reflife (2013-05-28) 25 commits
497
+* mh/reflife (2013-06-02) 25 commits
498
- refs: document the lifetime of the args passed to each_ref_fn
499
- register_ref(): make a copy of the bad reference SHA-1
500
- exclude_existing(): set existing_refs.strdup_strings
@@ -575,7 +586,7 @@ of the repositories listed at
586
Will merge to 'next'.
587
588
578
-* rr/die-on-missing-upstream (2013-05-22) 2 commits
589
+* rr/die-on-missing-upstream (2013-06-02) 2 commits
590
- sha1_name: fix error message for @{<N>}, @{<date>}
591
- sha1_name: fix error message for @{u}
592
@@ -646,13 +657,6 @@ of the repositories listed at
657
mode at wrong places? Cf. $gmane/225735
658
659
649
-* rh/merge-options-doc-fix (2013-05-16) 1 commit
650
- (merged to 'next' on 2013-05-21 at f76baf3)
651
- + Documentation/merge-options.txt: restore `-e` option
652
-
653
- Will merge to 'master'.
654
-
655
-
660
* rr/zsh-color-prompt (2013-05-17) 3 commits
661
- prompt: colorize ZSH prompt
662
- prompt: factor out gitstring coloring logic
@@ -661,61 +665,12 @@ of the repositories listed at
665
Will merge to 'next'.
666
667
664
-* an/diff-index-doc (2013-05-20) 1 commit
665
- (merged to 'next' on 2013-05-21 at 6e1459b)
666
- + Documentation/diff-index: mention two modes of operation
667
-
668
- Will merge to 'master'.
669
-
670
-
668
* fc/contrib-related (2013-05-20) 1 commit
669
- Add new git-related helper to contrib
670
671
Waiting the design review for this earliest part to settle.
672
673
677
-* mc/describe-first-parent (2013-05-20) 1 commit
678
- (merged to 'next' on 2013-05-21 at 2e02ffc)
679
- + describe: Add --first-parent option
680
-
681
- Will merge to 'master'.
682
-
683
-
684
-* rs/tar-tests (2013-05-20) 6 commits
685
- (merged to 'next' on 2013-05-21 at aed12a7)
686
- + t5000: test long filenames
687
- + t5000: simplify tar-tree tests
688
- + t5000: use check_tar for prefix test
689
- + t5000: factor out check_tar
690
- + t5000, t5003: create directories for extracted files lazily
691
- + t5000: integrate export-subst tests into regular tests
692
-
693
- Will merge to 'master'.
694
-
695
-
696
-* da/darwin (2013-05-21) 4 commits
697
- (merged to 'next' on 2013-05-21 at 0497edb)
698
- + imap-send: eliminate HMAC deprecation warnings on Mac OS X
699
- + cache.h: eliminate SHA-1 deprecation warnings on Mac OS X
700
- + Makefile: add support for Apple CommonCrypto facility
701
- + Makefile: fix default regex settings on Darwin
702
-
703
- Newer MacOS X encourages the programs to compile and link with
704
- their CommonCrypto, not with OpenSSL.
705
-
706
- Will merge to 'master'.
707
-
708
-
709
-* fc/macos-x-clipped-write (2013-05-17) 1 commit
710
- (merged to 'next' on 2013-05-21 at 510b0dd)
711
- + compate/clipped-write.c: large write(2) fails on Mac OS X/XNU
712
-
713
- Mac OS X does not like to write(2) more than INT_MAX number of
714
- bytes.
715
-
716
- Will merge to 'master'.
717
-
718
-
674
* fc/remote-hg (2013-05-28) 50 commits
675
- remote-hg: add support for --force
676
- remote-hg: add support for --dry-run
@@ -782,35 +737,6 @@ of the repositories listed at
737
$gmane/223964
738
739
785
-* jc/t5551-posix-sed-bre (2013-05-12) 1 commit
786
- (merged to 'next' on 2013-05-21 at d597ca1)
787
- + t5551: do not use unportable sed '\+'
788
-
789
- POSIX fix for a test script.
790
-
791
- Will merge to 'master'.
792
-
793
-
794
-* jk/fetch-always-update-tracking (2013-05-28) 5 commits
795
- (merged to 'next' on 2013-05-28 at c6abf3f)
796
- + fetch: don't try to update unfetched tracking refs
797
- (merged to 'next' on 2013-05-21 at f7e4b16)
798
- + fetch: opportunistically update tracking refs
799
- + refactor "ref->merge" flag
800
- + fetch/pull doc: untangle meaning of bare <ref>
801
- + t5510: start tracking-ref tests from a known state
802
-
803
- "git fetch origin master" unlike "git fetch origin" or "git fetch"
804
- does not update "refs/remotes/origin/master" and it was an early
805
- design decision to keep the update of remote tracking branches
806
- predictable, but in practice it turns out that people find it more
807
- convenient to opportunisticly update them whenever we have a
808
- chance, and we have been updating them when we run "git push" which
809
- already breaks the original "predictability" anyway.
810
-
811
- Will merge to 'master'.
812
-
813
-
740
* nd/clone-connectivity-shortcut (2013-05-28) 4 commits
741
- clone: open a shortcut for connectivity check
742
- index-pack: remove dead code (it should never happen)
@@ -820,19 +746,6 @@ of the repositories listed at
746
Will merge to 'next'.
747
748
823
-* kb/ancestry-path-threedots (2013-05-16) 2 commits
824
- (merged to 'next' on 2013-05-21 at 5d75bd3)
825
- + revision.c: treat A...B merge bases as if manually specified
826
- + t6019: demonstrate --ancestry-path A...B breakage
827
- (this branch is used by kb/full-history-compute-treesame-carefully-2.)
828
-
829
- "git log --ancestry-path A...B" did not work as expected, as it did
830
- not pay attention to the fact that the merge base between A and B
831
- was the bottom of the range being specified.
832
-
833
- Will merge to 'master'.
834
-
835
-
749
* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
750
- revision.c: make default history consider bottom commits
751
- revision.c: don't show all merges for --parents
@@ -849,7 +762,6 @@ of the repositories listed at
762
- t6111: new TREESAME test set
763
- t6019: test file dropped in -s ours merge
764
- decorate.c: compact table when growing
852
- (this branch uses kb/ancestry-path-threedots.)
765
766
Major update to a very core part of the system to improve culling
767
of irrelevant parents while traversing a mergy history.
@@ -859,27 +771,6 @@ of the repositories listed at
771
Will merge to 'next'.
772
773
862
-* jc/strbuf-branchname-fix (2013-05-16) 1 commit
863
- (merged to 'next' on 2013-05-21 at 5db8872)
864
- + strbuf_branchname(): do not double-expand @{-1}~22
865
-
866
- "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"
867
- incorrectly when your previous branch was "frotz" (it should be
868
- rewritten to "git merge frotz~22" instead).
869
-
870
- Will merge to 'master'.
871
-
872
-
873
-* mk/combine-diff-context-horizon-fix (2013-05-15) 1 commit
874
- (merged to 'next' on 2013-05-21 at f462c02)
875
- + combine-diff.c: Fix output when changes are exactly 3 lines apart
876
-
877
- "git diff -c -p" was not showing a deleted line from a hunk when
878
- another hunk immediately begins where the earlier one ends.
879
-
880
- Will merge to 'master'.
881
-
882
-
774
* mm/color-auto-default (2013-05-15) 2 commits
775
- make color.ui default to 'auto'
776
- config: refactor management of color.ui's default value
@@ -894,19 +785,6 @@ of the repositories listed at
785
Waiting for a reroll.
786
787
897
-* tr/coverage (2013-05-13) 4 commits
898
- (merged to 'next' on 2013-05-21 at 8480007)
899
- + coverage: build coverage-untested-functions by default
900
- + coverage: set DEFAULT_TEST_TARGET to avoid using prove
901
- + coverage: do not delete .gcno files before building
902
- + coverage: split build target into compile and test
903
-
904
- Update the test coverage support that was left to bitrot for some
905
- time.
906
-
907
- Will merge to 'master'.
908
-
909
-
788
* jh/shorten-refname (2013-05-07) 4 commits
789
- t1514: refname shortening is done after dereferencing symbolic refs
790
- shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin
@@ -922,17 +800,6 @@ of the repositories listed at
800
Expecting a reroll, as an early part of a larger series.
801
802
925
-* nd/clone-local-with-colon (2013-05-07) 1 commit
926
- (merged to 'next' on 2013-05-21 at 3e293bd)
927
- + clone: allow cloning local paths with colons in them
928
-
929
- "git clone foo/bar:baz" cannot be a request to clone from a remote
930
- over git-over-ssh specified in the scp style. Detect this case and
931
- clone from a local repository at "foo/bar:baz".
932
-
933
- Will merge to 'master'.
934
-
935
-
803
* nd/warn-ambiguous-object-name (2013-05-29) 1 commit
804
- get_sha1: warn about full or short object names that look like refs
805
@@ -944,51 +811,6 @@ of the repositories listed at
811
name.
812
813
947
-* fc/zsh-leftover-bits (2013-05-29) 3 commits
948
- (merged to 'next' on 2013-05-29 at b367b4e)
949
- + completion: zsh: improve bash script loading
950
- (merged to 'next' on 2013-05-21 at 1b84ec1)
951
- + completion: synchronize zsh wrapper
952
- + completion: cleanup zsh wrapper
953
-
954
- Will merge to 'master'.
955
-
956
-
957
-* rs/empty-archive (2013-05-09) 2 commits
958
- (merged to 'next' on 2013-05-21 at 3e9e288)
959
- + t5004: resurrect original empty tar archive test
960
- + t5004: avoid using tar for checking emptiness of archive
961
-
962
- Fixes tests added in 1.8.2 era that are broken on BSDs.
963
-
964
- Will merge to 'master'.
965
-
966
-
967
-* vv/help-unknown-ref (2013-05-08) 2 commits
968
- (merged to 'next' on 2013-05-21 at 77a2941)
969
- + merge: use help_unknown_ref()
970
- + help: add help_unknown_ref()
971
-
972
- Detect "git merge foo" that might have meant "git merge origin/foo"
973
- and give an error message that is more specific than "foo is not
974
- something we can merge".
975
-
976
- Will merge to 'master'.
977
-
978
-
979
-* fc/fast-export-persistent-marks (2013-05-07) 3 commits
980
- (merged to 'next' on 2013-05-21 at 10b8214)
981
- + fast-{import,export}: use get_sha1_hex() to read from marks file
982
- + fast-export: don't parse commits while reading marks file
983
- + fast-export: do not parse non-commit objects while reading marks file
984
-
985
- Optimization for fast-export by avoiding unnecessarily resolving
986
- arbitrary object name and parsing object when only presence and
987
- type information is necessary, etc.
988
-
989
- Will merge to 'master'.
990
-
991
-
814
* jk/packed-refs-race (2013-05-06) 4 commits
815
- for_each_ref: load all loose refs before packed refs
816
- get_packed_refs: reload packed-refs file when it changes
@@ -1019,21 +841,6 @@ of the repositories listed at
841
Will merge to 'next'.
842
843
1022
-* fc/completion (2013-04-27) 9 commits
1023
- (merged to 'next' on 2013-05-21 at aba6ef1)
1024
- + completion: remove __git_index_file_list_filter()
1025
- + completion: add space after completed filename
1026
- + completion: add hack to enable file mode in bash < 4
1027
- + completion: refactor __git_complete_index_file()
1028
- + completion: refactor diff_index wrappers
1029
- + completion: use __gitcompadd for __gitcomp_file
1030
- + completion; remove unuseful comments
1031
- + completion: document tilde expansion failure in tests
1032
- + completion: add file completion tests
1033
-
1034
- Will merge to 'master'.
1035
-
1036
-
844
* jk/submodule-subdirectory-ok (2013-04-24) 3 commits
845
(merged to 'next' on 2013-04-24 at 6306b29)
846
+ submodule: fix quoting in relative_path()