What's cooking (2013/01 #03)
Junio C Hamano committed
Jan 6, 2013 at 18:40 UTC
7268cef45100c70ee83c1d0efbe011833e14c07d
1 file changed
+398
-436
whats-cooking.txt
+398
-436
@@ -1,19 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2013, #02; Thu, 3)
4
-X-master-at: 3e293fba627e254b2c7d196bb7563c6c9d2e6f8a
5
-X-next-at: 64b3e71d071ea592b3e4e52272e50cf5909226b6
3
+Subject: What's cooking in git.git (Jan 2013, #03; Sun, 6)
4
+X-master-at: 32238aeb730fda0f66ccc6ec2f1e342af8b9fd04
5
+X-next-at: 6e0eed0d38e507b7cf6c43be8a89ad15eb9aab5e
6
7
-What's cooking in git.git (Jan 2013, #02; Thu, 3)
7
+What's cooking in git.git (Jan 2013, #03; Sun, 6)
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
-The post 1.8.1 cycle has started, and about a dozen topics (mostly
15
-fixes) have graduated to the 'master' branch. The second batch will
16
-follow shortly.
14
+The tip of 'next' will be rewound and rebuilt shortly, kicking a
15
+couple of topics back to 'pu' and reordering the remainder as
16
+needed.
17
18
As usual, this cycle is expected to last for 8 to 10 weeks. To
19
ensure the quality of the end result, let's merge topics in flight
@@ -25,260 +25,312 @@ repositories listed at
25
http://git-blame.blogspot.com/p/git-public-repositories.html
26
27
--------------------------------------------------
28
-[New Topics]
28
+[Graduated to "master"]
29
30
-* jn/less-reconfigure (2013-01-02) 1 commit
31
- (merged to 'next' on 2013-01-02 at e5cd6cf)
32
- + build: do not automatically reconfigure unless configure.ac changed
30
+* cr/push-force-tag-update (2012-12-03) 10 commits
31
+ (merged to 'next' on 2012-12-04 at af2e3a9)
32
+ + push: allow already-exists advice to be disabled
33
+ + push: rename config variable for more general use
34
+ + push: cleanup push rules comment
35
+ + push: clarify rejection of update to non-commit-ish
36
+ + push: require force for annotated tags
37
+ + push: require force for refs under refs/tags/
38
+ + push: flag updates that require force
39
+ + push: keep track of "update" state separately
40
+ + push: add advice for rejected tag reference
41
+ + push: return reject reasons as a bitset
42
34
- When autoconf is used, any build on a different commit always ran
35
- "config.status --recheck" even when unnecessary.
43
+ Require "-f" for push to update a tag, even if it is a fast-forward.
44
45
38
-* ap/merge-stop-at-prepare-commit-msg-failure (2013-01-03) 1 commit
39
- - merge: Honor prepare-commit-msg return code
46
+* fc/fast-export-fixes (2012-12-03) 15 commits
47
+ (merged to 'next' on 2012-12-03 at f9df523)
48
+ + fast-export: make sure updated refs get updated
49
+ + fast-export: don't handle uninteresting refs
50
+ + fast-export: fix comparison in tests
51
+ + fast-export: trivial cleanup
52
+ + remote-testgit: implement the "done" feature manually
53
+ + remote-testgit: report success after an import
54
+ + remote-testgit: exercise more features
55
+ + remote-testgit: cleanup tests
56
+ + remote-testgit: remove irrelevant test
57
+ + remote-testgit: remove non-local functionality
58
+ + Add new simplified git-remote-testgit
59
+ + Rename git-remote-testgit to git-remote-testpy
60
+ + remote-helpers: fix failure message
61
+ + remote-testgit: fix direction of marks
62
+ + fast-export: avoid importing blob marks
63
41
- "git merge" started calling prepare-commit-msg hook like "git
42
- commit" does some time ago, but forgot to pay attention to the exit
43
- status of the hook. t7505 may want a general clean-up but that is
44
- a different topic.
64
+ Various updates to fast-export used in the context of the remote
65
+ helper interface.
66
46
- Will merge to 'next'.
67
68
+* ja/directory-attrs (2012-12-17) 1 commit
69
+ (merged to 'next' on 2012-12-17 at ced8e73)
70
+ + Add directory pattern matching to attributes
71
49
-* tb/test-shell-lint (2013-01-02) 1 commit
50
- - test: Add check-non-portable-shell.pl
72
+ The attribute mechanism didn't allow limiting attributes to be
73
+ applied to only a single directory itself with "path/" like the
74
+ exclude mechanism does.
75
52
- Check for common mistakes in the test scripts, based on simple
53
- pattern-matching.
76
55
- Will merge to 'next'.
77
+* jc/fetch-ignore-symref (2012-12-11) 1 commit
78
+ (merged to 'next' on 2012-12-17 at 370e2c8)
79
+ + fetch: ignore wildcarded refspecs that update local symbolic refs
80
81
+ Avoid false error from an attempt to update local symbolic ref via
82
+ fetch.
83
58
-* jk/enable-test-lint-by-default (2013-01-03) 1 commit
59
- - tests: turn on test-lint by default
84
61
- We had two simple and quick tests to catch common mistakes when
62
- writing test scripts, but they weren't run by default when running
63
- tests.
85
+* jc/format-color-auto (2012-12-17) 2 commits
86
+ (merged to 'next' on 2012-12-18 at 5aaac94)
87
+ + log --format: teach %C(auto,black) to respect color config
88
+ + t6006: clean up whitespace
89
65
- Will merge to 'next'.
90
+ Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does
91
+ not color its output when writing to a non-terminal.
92
67
---------------------------------------------------
68
-[Graduated to "master"]
93
70
-* as/test-tweaks (2012-12-20) 7 commits
71
- (merged to 'next' on 2012-12-22 at 7312c6c)
72
- + tests: paint unexpectedly fixed known breakages in bold red
73
- + tests: test the test framework more thoroughly
74
- + tests: refactor mechanics of testing in a sub test-lib
75
- + tests: change info messages from yellow/brown to cyan
76
- + tests: paint skipped tests in blue
77
- + tests: paint known breakages in yellow
78
- + tests: test number comes first in 'not ok $count - $message'
94
+* jk/complete-commit-c (2012-12-15) 1 commit
95
+ (merged to 'next' on 2012-12-18 at 75b5f21)
96
+ + completion: complete refs for "git commit -c"
97
80
- Output from the tests is coloured using "green is okay, yellow is
81
- questionable, red is bad and blue is informative" scheme.
98
+ Complete "git commmit -c foo<TAB>" into a refname that begins with
99
+ "foo".
100
101
84
-* da/p4merge-mktemp (2012-12-26) 1 commit
85
- (merged to 'next' on 2012-12-26 at 036938a)
86
- + mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
102
+* jk/error-const-return (2012-12-15) 2 commits
103
+ (merged to 'next' on 2012-12-22 at bf2b1cd)
104
+ + silence some -Wuninitialized false positives
105
+ + make error()'s constant return value more visible
106
88
- Create an empty file in $TMPDIR instead of using an empty file in
89
- the local directory.
107
+ Help compilers' flow analysis by making it more explicit that
108
+ error() always returns -1, to reduce false "variable used
109
+ uninitialized" warnings. Looks somewhat ugly but not too much.
110
111
92
-* dm/port (2012-12-19) 4 commits
93
- (merged to 'next' on 2012-12-22 at 8adc198)
94
- + git-compat-util.h: do not #include <sys/param.h> by default
95
- + Generalize the inclusion of strings.h
96
- + Detect when the passwd struct is missing pw_gecos
97
- + Support builds when sys/param.h is missing
98
- (this branch is used by mk/qnx.)
112
+* jk/fsck-dot-in-trees (2012-11-28) 2 commits
113
+ (merged to 'next' on 2012-11-28 at 519dabc)
114
+ + fsck: warn about ".git" in trees
115
+ + fsck: warn about '.' and '..' in trees
116
100
- Add a few more knobs for new platform ports can tweak.
117
118
+* jk/mailmap-from-blob (2012-12-13) 5 commits
119
+ (merged to 'next' on 2012-12-17 at 14b7cdc)
120
+ + mailmap: default mailmap.blob in bare repositories
121
+ + mailmap: fix some documentation loose-ends for mailmap.blob
122
+ + mailmap: clean up read_mailmap error handling
123
+ + mailmap: support reading mailmap from blobs
124
+ + mailmap: refactor mailmap parsing for non-file sources
125
103
-* jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit
104
- (merged to 'next' on 2012-12-11 at 6659fdc)
105
- + sh-setup: work around "unset IFS" bug in some shells
126
+ Allow us to read, and default to read, mailmap files from the tip
127
+ of the history in bare repositories. This will help running tools
128
+ like shortlog in server settings.
129
107
- Some shells do not behave correctly when IFS is unset; work it
108
- around by explicitly setting it to the default value.
130
131
+* mh/unify-xml-in-imap-send-and-http-push (2012-12-02) 8 commits
132
+ (merged to 'next' on 2012-12-03 at d677090)
133
+ + wrap_in_html(): process message in bulk rather than line-by-line
134
+ + wrap_in_html(): use strbuf_addstr_xml_quoted()
135
+ + imap-send: change msg_data from storing (ptr, len) to storing strbuf
136
+ + imap-send: correctly report errors reading from stdin
137
+ + imap-send: store all_msgs as a strbuf
138
+ + lf_to_crlf(): NUL-terminate msg_data::data
139
+ + xml_entities(): use function strbuf_addstr_xml_quoted()
140
+ + Add new function strbuf_add_xml_quoted()
141
111
-* jc/maint-fnmatch-old-style-definition (2012-12-19) 1 commit
112
- (merged to 'next' on 2012-12-22 at 540df2c)
113
- + compat/fnmatch: update old-style definition to ANSI
142
+ Update imap-send to reuse xml quoting code from http-push codepath,
143
+ clean up some code, and fix a small bug.
144
115
- Update old-style function definition "int foo(bar) int bar; {}"
116
- to "int foo(int bar) {}".
145
146
+* nd/pathspec-wildcard (2012-11-26) 4 commits
147
+ (merged to 'next' on 2012-12-03 at eca0fcb)
148
+ + tree_entry_interesting: do basedir compare on wildcard patterns when possible
149
+ + pathspec: apply "*.c" optimization from exclude
150
+ + pathspec: do exact comparison on the leading non-wildcard part
151
+ + pathspec: save the non-wildcard length part
152
119
-* jc/maint-test-portability (2012-12-19) 3 commits
120
- (merged to 'next' on 2012-12-22 at daeed53)
121
- + t4014: fix arguments to grep
122
- + t9502: do not assume GNU tar
123
- + t0200: "locale" may not exist
124
- (this branch is used by jc/test-portability.)
153
+ Optimize matching paths with common forms of pathspecs that contain
154
+ wildcard characters.
155
126
- Minor test fixes noticed while running our tests on OpenBSD 5.2,
127
- applicable to 'maint'.
156
157
+* wk/submodule-update-remote (2012-12-19) 3 commits
158
+ (merged to 'next' on 2012-12-22 at 7ddf897)
159
+ + submodule add: If --branch is given, record it in .gitmodules
160
+ + submodule update: add --remote for submodule's upstream changes
161
+ + submodule: add get_submodule_config helper funtion
162
130
-* jc/mkstemp-more-careful-error-reporting (2012-12-18) 1 commit
131
- (merged to 'next' on 2012-12-22 at 18cdaf0)
132
- + xmkstemp(): avoid showing truncated template more carefully
163
+ The beginning of 'integrate with the tip of the remote branch, not
164
+ the commit recorded in the superproject gitlink' support.
165
134
- After failing to create a temporary file using mkstemp(), failing
135
- pathname was not reported correctly on some platforms.
166
+--------------------------------------------------
167
+[New Topics]
168
+
169
+* jk/pathspec-literal (2013-01-06) 1 commit
170
+ - t6130-pathspec-noglob: Windows does not allow a file named "f*"
171
172
+ Will merge to 'next' and 'master' as a quick "oops" fix.
173
138
-* jc/same-encoding (2012-12-10) 1 commit
139
- (merged to 'next' on 2012-12-17 at 86b41c7)
140
- + format_commit_message(): simplify calls to logmsg_reencode()
174
142
- Finishing touches to the series to unify "Do we need to reencode
143
- between these two encodings?" logic.
175
+* as/dir-c-cleanup (2012-12-28) 10 commits
176
+ - dir.c: rename free_excludes() to clear_exclude_list()
177
+ - dir.c: refactor is_path_excluded()
178
+ - dir.c: refactor is_excluded()
179
+ - dir.c: refactor is_excluded_from_list()
180
+ - dir.c: rename excluded() to is_excluded()
181
+ - dir.c: rename excluded_from_list() to is_excluded_from_list()
182
+ - dir.c: rename path_excluded() to is_path_excluded()
183
+ - dir.c: rename cryptic 'which' variable to more consistent name
184
+ - Improve documentation and comments regarding directory traversal API
185
+ - api-directory-listing.txt: update to match code
186
+ (this branch is used by as/check-ignore.)
187
188
+ Separated an earlier and more solidly done bits from the other
189
+ topic.
190
146
-* jc/test-cvs-no-init-in-existing-dir (2012-12-24) 1 commit
147
- (merged to 'next' on 2012-12-26 at 3b93f37)
148
- + t9200: let "cvs init" create the test repository
191
+ Will merge to 'next'.
192
150
- t9200 runs "cvs init" on a directory that already exists, but a
151
- platform can configure this fail for the current user (e.g. you
152
- need to be in the cvsadmin group on NetBSD 6.0).
193
194
+* jk/config-uname (2013-01-03) 1 commit
195
+ - Makefile: hoist uname autodetection to config.mak.uname
196
155
-* jc/test-portability (2012-12-19) 3 commits
156
- (merged to 'next' on 2012-12-22 at 123041b)
157
- + t9020: use configured Python to run the test helper
158
- + t3600: Avoid "cp -a", which is a GNUism
159
- + Merge branch 'jc/maint-test-portability' into 'jc/test-portability'
160
- (this branch uses jc/maint-test-portability.)
197
+ Move the bits to set fallback default based on the platform from
198
+ the main Makefile to a separate file, so that it can be included in
199
+ Makefiles in subdirectories.
200
162
- The remainder of jc/maint-test-portability, applicable to 'master'.
201
+ Will merge to 'next'.
202
203
165
-* jk/repack-ref-racefix (2012-12-21) 1 commit
166
- (merged to 'next' on 2012-12-22 at 03e1ca9)
167
- + refs: do not use cached refs in repack_without_ref
204
+* jc/push-2.0-default-to-simple (2013-01-04) 10 commits
205
+ - push: switch default from "matching" to "simple"
206
+ - t9401: do not assume the "matching" push is the default
207
+ - t9400: do not assume the "matching" push is the default
208
+ - t7406: do not assume the "matching" push is the default
209
+ - t5531: do not assume the "matching" push is the default
210
+ - t5519: do not assume the "matching" push is the default
211
+ - t5517: do not assume the "matching" push is the default
212
+ - t5516: do not assume the "matching" push is the default
213
+ - t5505: do not assume the "matching" push is the default
214
+ - t5404: do not assume the "matching" push is the default
215
169
- "git pack-refs" that ran in parallel to another process that
170
- created new refs had a nasty race.
216
+ Will merge to 'next' and cook there until Git 2.0.
217
218
173
-* md/gitweb-sort-by-age (2012-12-11) 1 commit
174
- (merged to 'next' on 2012-12-13 at 9f39410)
175
- + gitweb: Sort projects with undefined ages last
219
+* jk/maint-fast-import-doc-dedup-done (2013-01-05) 1 commit
220
+ - git-fast-import(1): remove duplicate "--done" option
221
177
- Gitweb showed repositories without any commit at the top in its
178
- age-sorted view, in which the users are interested in looking at
179
- active projects; sorting them at the bottom makes it more useful.
222
+ Will merge to 'next' and 'master' as a quick "oops" fix.
223
224
+ The "logical order" reorganization can come after that is done and
225
+ can cook longer in 'next'.
226
182
-* mh/ceiling (2012-10-29) 8 commits
183
- (merged to 'next' on 2012-11-26 at d1ce76a)
184
- + string_list_longest_prefix(): remove function
185
- + setup_git_directory_gently_1(): resolve symlinks in ceiling paths
186
- + longest_ancestor_length(): require prefix list entries to be normalized
187
- + longest_ancestor_length(): take a string_list argument for prefixes
188
- + longest_ancestor_length(): use string_list_split()
189
- + Introduce new function real_path_if_valid()
190
- + real_path_internal(): add comment explaining use of cwd
191
- + Introduce new static function real_path_internal()
227
193
- Elements of GIT_CEILING_DIRECTORIES list may not match the real
194
- pathname we obtain from getcwd(), leading the GIT_DIR discovery
195
- logic to escape the ceilings the user thought to have specified.
228
+* jk/unify-exit-code-by-receiving-signal (2013-01-06) 1 commit
229
+ - run-command: encode signal death as a positive integer
230
231
+ The internal logic had to deal with two representations of a death
232
+ of a child process by a signal.
233
198
-* mh/pthreads-autoconf (2012-11-27) 1 commit
199
- (merged to 'next' on 2012-11-28 at 780600e)
200
- + configure.ac: fix pthreads detection on Mac OS X
234
+ Will merge to 'next'.
235
236
203
-* mk/maint-graph-infinity-loop (2012-09-25) 1 commit
204
- (merged to 'next' on 2012-12-26 at 2ff59ab)
205
- + graph.c: infinite loop in git whatchanged --graph -m
237
+* jl/interrupt-clone-remove-separate-git-dir (2013-01-05) 1 commit
238
+ - clone: support atomic operation with --separate-git-dir
239
207
- The --graph code fell into infinite loop when asked to do what the
208
- code did not expect ;-)
240
+ When "git clone --separate-git-dir" is interrupted, we failed to
241
+ remove the real location we created the repository.
242
243
+ Will merge to 'next'.
244
211
-* mk/qnx (2012-12-19) 2 commits
212
- (merged to 'next' on 2012-12-22 at 0473197)
213
- + Port to QNX
214
- + Make lock local to fetch_pack
215
- (this branch uses dm/port.)
245
217
- Port to QNX.
246
+* rs/leave-base-name-in-name-field-of-tar (2013-01-05) 1 commit
247
+ - archive-tar: split long paths more carefully
248
249
+ Improve compatibility with implementations of "tar" that do not
250
+ like empty name field in header (with the additional prefix field
251
+ holding everything).
252
220
-* ms/subtree-fixlets (2012-12-22) 2 commits
221
- (merged to 'next' on 2012-12-26 at 1cb26eb)
222
- + git-subtree: fix typo in manpage
223
- + git-subtree: ignore git-subtree executable
253
+ Will merge to 'next'.
254
255
226
-* nd/invalidate-i-t-a-cache-tree (2012-12-15) 4 commits
227
- (merged to 'next' on 2012-12-18 at 33e4488)
228
- + cache-tree: invalidate i-t-a paths after generating trees
229
- + cache-tree: fix writing cache-tree when CE_REMOVE is present
230
- + cache-tree: replace "for" loops in update_one with "while" loops
231
- + cache-tree: remove dead i-t-a code in verify_cache()
256
+* as/api-allocation-doc (2013-01-06) 1 commit
257
+ - api-allocation-growing.txt: encourage better variable naming
258
233
- Writing out a tree object when you still have intent-to-add entries
234
- in the index left an incorrect cache-tree data there.
259
+ Will merge to 'next'.
260
261
237
-* pf/editor-ignore-sigint (2012-12-02) 5 commits
238
- (merged to 'next' on 2012-12-07 at 6b04419)
239
- + launch_editor: propagate signals from editor to git
240
- + run-command: do not warn about child death from terminal
241
- + launch_editor: ignore terminal signals while editor has control
242
- + launch_editor: refactor to use start/finish_command
243
- + run-command: drop silent_exec_failure arg from wait_or_whine
262
+* jc/comment-cygwin-win32api-in-makefile (2013-01-06) 1 commit
263
+ - Makefile: add comment on CYGWIN_V15_WIN32API
264
245
- The behaviour visible to the end users was confusing, when they
246
- attempt to kill a process spawned in the editor that was in turn
247
- launched by Git with SIGINT (or SIGQUIT), as Git would catch that
248
- signal and die. We ignore these signals now.
265
+ Will merge to 'next'.
266
267
251
-* rb/http-cert-cred-no-username-prompt (2012-12-21) 1 commit
252
- (merged to 'next' on 2012-12-22 at 9fc28ed)
253
- + http.c: Avoid username prompt for certifcate credentials
268
+* jn/xml-depends-on-asciidoc-conf (2013-01-06) 1 commit
269
+ - docs: manpage XML depends on asciidoc.conf
270
255
- It is wrong to ask for username if the authentication is done by
256
- certificate identity.
271
+ Will merge to 'next'.
272
273
259
-* sp/shortlog-missing-lf (2012-12-11) 2 commits
260
- (merged to 'next' on 2012-12-11 at 64b8429)
261
- + strbuf_add_wrapped*(): Remove unused return value
262
- + shortlog: fix wrapping lines of wraplen
274
+* nd/clone-no-separate-git-dir-with-bare (2013-01-06) 1 commit
275
+ - clone: forbid --bare --separate-git-dir <dir>
276
264
- When a line to be wrapped has a solid run of non space characters
265
- whose length exactly is the wrap width, "git shortlog -w" failed to
266
- add a newline after such a line.
277
+ Expecting a reroll.
278
+ $gmane/212863
279
+
280
+
281
+* nd/parse-pathspec (2013-01-06) 21 commits
282
+ - Convert more init_pathspec() to parse_pathspec()
283
+ - Convert add_files_to_cache to take struct pathspec
284
+ - Convert {read,fill}_directory to take struct pathspec
285
+ - Convert refresh_index to take struct pathspec
286
+ - Convert report_path_error to take struct pathspec
287
+ - checkout: convert read_tree_some to take struct pathspec
288
+ - Convert unmerge_cache to take struct pathspec
289
+ - Convert read_cache_preload() to take struct pathspec
290
+ - add: convert to use parse_pathspec
291
+ - archive: convert to use parse_pathspec
292
+ - ls-files: convert to use parse_pathspec
293
+ - rm: convert to use parse_pathspec
294
+ - checkout: convert to use parse_pathspec
295
+ - rerere: convert to use parse_pathspec
296
+ - status: convert to use parse_pathspec
297
+ - commit: convert to use parse_pathspec
298
+ - clean: convert to use parse_pathspec
299
+ - Export parse_pathspec() and convert some get_pathspec() calls
300
+ - pathspec: make sure the prefix part is wildcard-clean
301
+ - Add parse_pathspec() that converts cmdline args to struct pathspec
302
+ - pathspec: save the non-wildcard length part
303
+
304
+ Uses the parsed pathspec structure in more places where we used to
305
+ use the raw "array of strings" pathspec.
306
+
307
+ Unfortunately, this conflicts a couple of topics in flight. I tried
308
+ to be careful while resolving conflicts, though.
309
+
310
+
311
+* rs/zip-tests (2013-01-06) 4 commits
312
+ - t5003: check if unzip supports symlinks
313
+ - t5000, t5003: move ZIP tests into their own script
314
+ - t0024, t5000: use test_lazy_prereq for UNZIP
315
+ - t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
316
+
317
+ Updates zip tests to skip some that cannot be handled on platform
318
+ unzip.
319
+
320
+ I've renamed the t5002 in the original to t5003 to avoid name
321
+ clashes with another topic in flight.
322
323
+ Will merge to 'next'.
324
269
-* ss/nedmalloc-compilation (2012-12-11) 1 commit
270
- (merged to 'next' on 2012-12-13 at c1f0d7f)
271
- + nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
325
326
+* rs/zip-with-uncompressed-size-in-the-header (2013-01-06) 1 commit
327
+ - archive-zip: write uncompressed size into header even with streaming
328
274
-* ss/svn-prompt (2012-12-17) 3 commits
275
- (merged to 'next' on 2012-12-26 at 1012ae2)
276
- + git-svn, perl/Git.pm: extend and use Git->prompt method for querying users
277
- + perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
278
- + git-svn, perl/Git.pm: add central method for prompting passwords
329
+ Improve compatibility of our zip output to fill uncompressed size
330
+ in the header, which we can do without seeking back (even though it
331
+ should not be necessary).
332
280
- Tweak the way "git svn" asks for password to be in line with the
281
- rest of the system, so that the same SSH/GIT_ASKPASS can be used.
333
+ Will merge to 'next'.
334
335
--------------------------------------------------
336
[Stalled]
@@ -299,12 +351,6 @@ repositories listed at
351
Will kick back to 'pu'.
352
353
302
-* jc/doc-maintainer (2012-11-27) 1 commit
303
- - update "howto maintain git"
304
-
305
- An early draft that is still incomplete.
306
-
307
-
354
* jk/lua-hackery (2012-10-07) 6 commits
355
- pretty: fix up one-off format_commit_message calls
356
- Minimum compilation fixup
@@ -404,15 +450,53 @@ repositories listed at
450
--------------------------------------------------
451
[Cooking]
452
407
-* jc/doc-default-format (2013-01-03) 2 commits
408
- - Allow installing a non-default set of documentation
409
- - Allow generating a non-default set of documentation
453
+* jn/less-reconfigure (2013-01-02) 1 commit
454
+ (merged to 'next' on 2013-01-02 at e5cd6cf)
455
+ + build: do not automatically reconfigure unless configure.ac changed
456
411
- Instead of the default of generating html/man and installing man,
412
- you can control what "make doc" and "make install-doc" do via two
413
- make variables.
457
+ When autoconf is used, any build on a different commit always ran
458
+ "config.status --recheck" even when unnecessary.
459
+
460
+ Will merge to 'master'.
461
+
462
+
463
+* ap/merge-stop-at-prepare-commit-msg-failure (2013-01-03) 1 commit
464
+ (merged to 'next' on 2013-01-04 at 251e88b)
465
+ + merge: Honor prepare-commit-msg return code
466
+
467
+ "git merge" started calling prepare-commit-msg hook like "git
468
+ commit" does some time ago, but forgot to pay attention to the exit
469
+ status of the hook. t7505 may want a general clean-up but that is
470
+ a different topic.
471
+
472
+ Will merge to 'master'.
473
415
- Will merge to 'next'.
474
+
475
+* tb/test-shell-lint (2013-01-02) 1 commit
476
+ (merged to 'next' on 2013-01-04 at 0289566)
477
+ + test: Add check-non-portable-shell.pl
478
+
479
+ Check for common mistakes in the test scripts, based on simple
480
+ pattern-matching.
481
+
482
+
483
+* jk/enable-test-lint-by-default (2013-01-03) 1 commit
484
+ (merged to 'next' on 2013-01-04 at 65b21ad)
485
+ + tests: turn on test-lint by default
486
+
487
+ We had two simple and quick tests to catch common mistakes when
488
+ writing test scripts, but they weren't run by default when running
489
+ tests.
490
+
491
+ Will merge to 'master'.
492
+
493
+
494
+* jc/doc-maintainer (2013-01-03) 2 commits
495
+ - howto/maintain: mark titles for asciidoc
496
+ - Documentation: update "howto maintain git"
497
+
498
+ Describe tools for automation that were invented since this
499
+ document was originally written.
500
501
502
* fc/remote-testgit-feature-done (2012-10-29) 1 commit
@@ -426,19 +510,20 @@ repositories listed at
510
511
512
* fc/remote-bzr (2013-01-02) 9 commits
429
- - remote-bzr: detect local repositories
430
- - remote-bzr: add support for older versions of bzr
431
- - remote-bzr: add support to push special modes
432
- - remote-bzr: add support for fecthing special modes
433
- - remote-bzr: add simple tests
434
- - remote-bzr: update working tree upon pushing
435
- - remote-bzr: add support for remote repositories
436
- - remote-bzr: add support for pushing
437
- - Add new remote-bzr transport helper
513
+ (merged to 'next' on 2013-01-04 at 7791dcb)
514
+ + remote-bzr: detect local repositories
515
+ + remote-bzr: add support for older versions of bzr
516
+ + remote-bzr: add support to push special modes
517
+ + remote-bzr: add support for fecthing special modes
518
+ + remote-bzr: add simple tests
519
+ + remote-bzr: update working tree upon pushing
520
+ + remote-bzr: add support for remote repositories
521
+ + remote-bzr: add support for pushing
522
+ + Add new remote-bzr transport helper
523
524
New remote helper for bzr, with minimum fix squashed in.
525
441
- Will merge to 'next'.
526
+ Will merge to 'master'.
527
528
529
* mo/cvs-server-updates (2012-12-09) 18 commits
@@ -464,43 +549,57 @@ repositories listed at
549
As nobody seems to be stepping up to review this, I am tempted to
550
merge this to 'next and see who screams.
551
552
+ Will merge to 'next'.
553
+
554
555
* jc/submittingpatches (2013-01-02) 4 commits
469
- - SubmittingPatches: give list and maintainer addresses
470
- - SubmittingPatches: remove overlong checklist
471
- - SubmittingPatches: mention subsystems with dedicated repositories
472
- - SubmittingPatches: who am I and who cares?
556
+ (merged to 'next' on 2013-01-04 at 060ffb0)
557
+ + SubmittingPatches: give list and maintainer addresses
558
+ + SubmittingPatches: remove overlong checklist
559
+ + SubmittingPatches: mention subsystems with dedicated repositories
560
+ + SubmittingPatches: who am I and who cares?
561
474
- Will merge to 'next'.
562
+ Streamline the document and update with a few e-mail addresses the
563
+ patches should be sent to.
564
+
565
+ Will merge to 'master'.
566
567
568
* kb/maint-bundle-doc (2013-01-01) 2 commits
478
- - Documentation: full-ness of a bundle is significant for cloning
479
- - Documentation: correct example restore from bundle
569
+ (merged to 'next' on 2013-01-04 at 73486d9)
570
+ + Documentation: full-ness of a bundle is significant for cloning
571
+ + Documentation: correct example restore from bundle
572
481
- Will merge to 'next'.
573
+ Will merge to 'master'.
574
575
576
* nd/maint-branch-desc-doc (2013-01-03) 5 commits
485
- - format-patch: pick up branch description when no ref is specified
486
- - format-patch: pick up correct branch name from symbolic ref
487
- - t4014: a few more tests on cover letter using branch description
488
- - branch: delete branch description if it's empty
489
- - config.txt: a few lines about branch.<name>.description
577
+ (merged to 'next' on 2013-01-04 at d05a47f)
578
+ + format-patch: pick up branch description when no ref is specified
579
+ + format-patch: pick up correct branch name from symbolic ref
580
+ + t4014: a few more tests on cover letter using branch description
581
+ + branch: delete branch description if it's empty
582
+ + config.txt: a few lines about branch.<name>.description
583
491
- Will merge to 'next'.
584
+ Teach various forms of "format-patch" command line to identify what
585
+ branch the patches are taken from, so that the branch description
586
+ is picked up in more cases.
587
+
588
+ Will merge to 'master'.
589
590
591
* tb/test-t9020-no-which (2013-01-01) 1 commit
495
- - t9020: which is not portable
592
+ (merged to 'next' on 2013-01-04 at 0bcf646)
593
+ + t9020: which is not portable
594
497
- Will merge to 'next'.
595
+ Will merge to 'master'.
596
597
598
* tb/test-t9810-no-sed-i (2013-01-01) 1 commit
501
- - t9810: Do not use sed -i
599
+ (merged to 'next' on 2013-01-04 at 0da03e6)
600
+ + t9810: Do not use sed -i
601
503
- Will merge to 'next'.
602
+ Will merge to 'master'.
603
604
605
* aw/rebase-am-failure-detection (2012-10-11) 1 commit
@@ -511,11 +610,14 @@ repositories listed at
610
case it aborts, to give a better failure-case behaviour.
611
612
514
-* ap/status-ignored-in-ignored-directory (2013-01-01) 2 commits
515
- - git-status: Test --ignored behavior
516
- - dir.c: Make git-status --ignored more consistent
613
+* ap/status-ignored-in-ignored-directory (2013-01-06) 3 commits
614
+ - status: always report ignored tracked directories
615
+ (merged to 'next' on 2013-01-04 at 114fb2f)
616
+ + git-status: Test --ignored behavior
617
+ + dir.c: Make git-status --ignored more consistent
618
518
- Will merge to 'next'.
619
+ Output from "git status --ignored" showed an unexpected interaction
620
+ with "--untracked".
621
622
623
* ta/remove-stale-translated-tut (2012-12-27) 1 commit
@@ -524,6 +626,8 @@ repositories listed at
626
627
Remove a translation of a document that was left stale.
628
629
+ Will merge to 'master'.
630
+
631
632
* er/stop-recommending-parsecvs (2012-12-28) 1 commit
633
(merged to 'next' on 2013-01-02 at fd816dd)
@@ -531,6 +635,8 @@ repositories listed at
635
636
Stop recommending a defunct third-party software.
637
638
+ Will merge to 'master'.
639
+
640
641
* as/test-name-alias-uniquely (2012-12-28) 1 commit
642
(merged to 'next' on 2013-01-02 at e297810)
@@ -539,6 +645,8 @@ repositories listed at
645
A few short-and-bland aliases used in the tests were interfering
646
with git-custom command in user's $PATH.
647
648
+ Will merge to 'master'.
649
+
650
651
* jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit
652
(merged to 'next' on 2013-01-02 at 8795e87)
@@ -547,48 +655,43 @@ repositories listed at
655
Stop spending cycles to compute information to be placed on
656
commented lines in "merge --no-edit".
657
658
+ Will merge to 'master'.
659
+
660
551
-* as/check-ignore (2012-12-28) 19 commits
552
- - Add git-check-ignore sub-command
661
+* as/check-ignore (2013-01-06) 11 commits
662
+ - add git-check-ignore sub-command
663
- setup.c: document get_pathspec()
554
- - pathspec.c: extract new validate_path() for reuse
555
- - pathspec.c: move reusable code from builtin/add.c
664
+ - add.c: extract new die_if_path_beyond_symlink() for reuse
665
+ - add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse
666
+ - pathspec.c: rename newly public functions for clarity
667
+ - add.c: move pathspec matchers into new pathspec.c for reuse
668
- add.c: remove unused argument from validate_pathspec()
557
- - add.c: refactor treat_gitlinks()
669
+ - dir.c: improve docs for match_pathspec() and match_pathspec_depth()
670
- dir.c: provide clear_directory() for reclaiming dir_struct memory
671
- dir.c: keep track of where patterns came from
672
- dir.c: use a single struct exclude_list per source of excludes
561
- - dir.c: rename free_excludes() to clear_exclude_list()
562
- - dir.c: refactor is_path_excluded()
563
- - dir.c: refactor is_excluded()
564
- - dir.c: refactor is_excluded_from_list()
565
- - dir.c: rename excluded() to is_excluded()
566
- - dir.c: rename excluded_from_list() to is_excluded_from_list()
567
- - dir.c: rename path_excluded() to is_path_excluded()
568
- - dir.c: rename cryptic 'which' variable to more consistent name
569
- - Improve documentation and comments regarding directory traversal API
570
- - api-directory-listing.txt: update to match code
673
+ (this branch uses as/dir-c-cleanup.)
674
572
- Rerolled. The early parts looked mostly fine; we may want to split
573
- this into two topics and have the early half graduate sooner.
675
+ Rerolled.
676
677
576
-* jc/format-patch-reroll (2013-01-02) 9 commits
577
- - format-patch: give --reroll-count a short synonym -v
578
- - format-patch: document and test --reroll-count
579
- - format-patch: add --reroll-count=$N option
580
- - get_patch_filename(): split into two functions
581
- - get_patch_filename(): drop "just-numbers" hack
582
- - get_patch_filename(): simplify function signature
583
- - builtin/log.c: stop using global patch_suffix
584
- - builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()
585
- - builtin/log.c: drop unused "numbered" parameter from make_cover_letter()
678
+* jc/format-patch-reroll (2013-01-03) 9 commits
679
+ (merged to 'next' on 2013-01-04 at 6840dbd)
680
+ + format-patch: give --reroll-count a short synonym -v
681
+ + format-patch: document and test --reroll-count
682
+ + format-patch: add --reroll-count=$N option
683
+ + get_patch_filename(): split into two functions
684
+ + get_patch_filename(): drop "just-numbers" hack
685
+ + get_patch_filename(): simplify function signature
686
+ + builtin/log.c: stop using global patch_suffix
687
+ + builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()
688
+ + builtin/log.c: drop unused "numbered" parameter from make_cover_letter()
689
690
Teach "format-patch" to prefix v4- to its output files for the
691
fourth iteration of a patch series, to make it easier for the
692
submitter to keep separate copies for iterations.
693
591
- Will merge to 'next'.
694
+ Will merge to 'master'.
695
696
697
* mz/pick-unborn (2012-12-23) 2 commits
@@ -601,26 +704,30 @@ repositories listed at
704
705
706
* nd/retire-fnmatch (2013-01-01) 7 commits
604
- - Makefile: add USE_WILDMATCH to use wildmatch as fnmatch
605
- - wildmatch: advance faster in <asterisk> + <literal> patterns
606
- - wildmatch: make a special case for "*/" with FNM_PATHNAME
607
- - test-wildmatch: add "perf" command to compare wildmatch and fnmatch
608
- - wildmatch: support "no FNM_PATHNAME" mode
609
- - wildmatch: make dowild() take arbitrary flags
610
- - wildmatch: rename constants and update prototype
707
+ (merged to 'next' on 2013-01-04 at 4dc3ff1)
708
+ + Makefile: add USE_WILDMATCH to use wildmatch as fnmatch
709
+ + wildmatch: advance faster in <asterisk> + <literal> patterns
710
+ + wildmatch: make a special case for "*/" with FNM_PATHNAME
711
+ + test-wildmatch: add "perf" command to compare wildmatch and fnmatch
712
+ + wildmatch: support "no FNM_PATHNAME" mode
713
+ + wildmatch: make dowild() take arbitrary flags
714
+ + wildmatch: rename constants and update prototype
715
(this branch uses nd/wildmatch.)
716
717
Replace our use of fnmatch(3) with a more feature-rich wildmatch.
718
A handful patches at the bottom have been moved to nd/wildmatch to
719
graduate as part of that branch, before this series solidifies.
720
617
- Will merge to 'next'.
618
-
721
722
* os/gitweb-highlight-uncaptured (2013-01-01) 1 commit
621
- - gitweb: fix error in sanitize when highlight is enabled
723
+ (merged to 'next' on 2013-01-04 at d565cdd)
724
+ + gitweb: fix error in sanitize when highlight is enabled
725
623
- Will merge to 'next'.
726
+ The code to sanitize control characters before passing it to
727
+ "highlight" filter lost known-to-be-safe control characters by
728
+ mistake.
729
+
730
+ Will merge to 'master'.
731
732
733
* jc/merge-blobs (2012-12-26) 5 commits
@@ -630,18 +737,9 @@ repositories listed at
737
- merge-tree: lose unused "flags" from merge_list
738
- Which merge_file() function do you mean?
739
633
- A beginning of a new merge strategy based on the disused merge-tree
634
- proof-of-concept code.
635
-
636
-
637
-* jk/pathspec-literal (2012-12-19) 1 commit
638
- (merged to 'next' on 2012-12-22 at c794bd6)
639
- + add global --literal-pathspecs option
740
+ Update the disused merge-tree proof-of-concept code.
741
641
- Allow scripts to feed literal paths to commands that take
642
- pathspecs, by disabling wildcard globbing.
643
-
644
- Will merge to 'master'.
742
+ Will merge to 'next'.
743
744
745
* er/python-version-requirements (2012-12-28) 1 commit
@@ -651,6 +749,8 @@ repositories listed at
749
Some python scripts we ship cannot be run with old versions of the
750
interpreter.
751
752
+ Will merge to 'master'.
753
+
754
755
* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
756
- Highlight the link target line in Gitweb using CSS
@@ -665,16 +765,6 @@ repositories listed at
765
766
Optimize "read-tree -m <tree-ish>" without "-u".
767
668
-
669
-* wk/submodule-update-remote (2012-12-19) 3 commits
670
- (merged to 'next' on 2012-12-22 at 7ddf897)
671
- + submodule add: If --branch is given, record it in .gitmodules
672
- + submodule update: add --remote for submodule's upstream changes
673
- + submodule: add get_submodule_config helper funtion
674
-
675
- The beginning of 'integrate with the tip of the remote branch, not
676
- the commit recorded in the superproject gitlink' support.
677
-
768
Will merge to 'master'.
769
770
@@ -691,19 +781,7 @@ repositories listed at
781
Will merge to 'master'.
782
783
694
-* jc/format-color-auto (2012-12-17) 2 commits
695
- (merged to 'next' on 2012-12-18 at 5aaac94)
696
- + log --format: teach %C(auto,black) to respect color config
697
- + t6006: clean up whitespace
698
-
699
- Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does
700
- not color its output when writing to a non-terminal.
701
-
702
- Will merge to 'master'.
703
-
704
-
705
-* zk/clean-report-failure (2013-01-02) 2 commits
706
- - (SQUASH???) fix-up only the trivial bits
784
+* zk/clean-report-failure (2013-01-06) 1 commit
785
- git-clean: Display more accurate delete messages
786
787
"git clean" states what it is going to remove and then goes on to
@@ -711,7 +789,7 @@ repositories listed at
789
removed after recursing into a directory, which makes the output
790
confusing and even wrong.
791
714
- Rerolled, and comments sent.
792
+ Rerolled.
793
794
795
* mp/complete-paths (2012-12-21) 1 commit
@@ -722,85 +800,28 @@ repositories listed at
800
would not want to add an unmodified path). Teach it to use a more
801
git-aware logic to enumerate only relevant ones.
802
725
- Waiting for area-experts' review.
726
-
727
-
728
-* ja/directory-attrs (2012-12-17) 1 commit
729
- (merged to 'next' on 2012-12-17 at ced8e73)
730
- + Add directory pattern matching to attributes
731
-
732
- The attribute mechanism didn't allow limiting attributes to be
733
- applied to only a single directory itself with "path/" like the
734
- exclude mechanism does.
735
-
736
- Will merge to 'master'.
737
-
738
-
739
-* jk/mailmap-from-blob (2012-12-13) 5 commits
740
- (merged to 'next' on 2012-12-17 at 14b7cdc)
741
- + mailmap: default mailmap.blob in bare repositories
742
- + mailmap: fix some documentation loose-ends for mailmap.blob
743
- + mailmap: clean up read_mailmap error handling
744
- + mailmap: support reading mailmap from blobs
745
- + mailmap: refactor mailmap parsing for non-file sources
746
-
747
- Allow us to read, and default to read, mailmap files from the tip
748
- of the history in bare repositories. This will help running tools
749
- like shortlog in server settings.
750
-
751
- Will merge to 'master'.
752
-
753
-
754
-* jk/complete-commit-c (2012-12-15) 1 commit
755
- (merged to 'next' on 2012-12-18 at 75b5f21)
756
- + completion: complete refs for "git commit -c"
757
-
758
- Complete "git commmit -c foo<TAB>" into a refname that begins with
759
- "foo".
803
+ It has been reported (no surprise) that this does not work inside
804
+ subdirectory. $gmane/212642
805
761
- Will merge to 'master'.
762
-
763
-
764
-* jk/error-const-return (2012-12-15) 2 commits
765
- (merged to 'next' on 2012-12-22 at bf2b1cd)
766
- + silence some -Wuninitialized false positives
767
- + make error()'s constant return value more visible
768
-
769
- Help compilers' flow analysis by making it more explicit that
770
- error() always returns -1, to reduce false "variable used
771
- uninitialized" warnings. Looks somewhat ugly but not too much.
772
-
773
- Will merge to 'master'.
806
+ Waiting for area-experts' review.
807
808
776
-* ap/log-mailmap (2012-12-27) 10 commits
777
- - log --use-mailmap: optimize for cases without --author/--committer search
809
+* ap/log-mailmap (2013-01-06) 10 commits
810
- log: add log.mailmap configuration option
811
- log: grep author/committer using mailmap
780
- - test: Add test for --use-mailmap option
781
- - log: Add --use-mailmap option
782
- - pretty: Use mailmap to display username and email
783
- - mailmap: Add mailmap structure to rev_info and pp
784
- - mailmap: Simplify map_user() interface
785
- - mailmap: Remove buffer length limit in map_user
812
+ - test: add test for --use-mailmap option
813
+ - log: add --use-mailmap option
814
+ - pretty: use mailmap to display username and email
815
+ - mailmap: add mailmap structure to rev_info and pp
816
+ - mailmap: simplify map_user() interface
817
+ - mailmap: remove email copy and length limitation
818
- Use split_ident_line to parse author and committer
787
- (this branch is used by jc/mailmap.)
819
+ - list_lookup: create case and length search
820
821
Clean up various codepaths around mailmap and teach the "log"
822
machinery to use it.
823
792
- Expecting a reroll.
793
- $gmane/212426
794
-
795
-
796
-* jc/fetch-ignore-symref (2012-12-11) 1 commit
797
- (merged to 'next' on 2012-12-17 at 370e2c8)
798
- + fetch: ignore wildcarded refspecs that update local symbolic refs
799
-
800
- Avoid false error from an attempt to update local symbolic ref via
801
- fetch.
802
-
803
- Will merge to 'master'.
824
+ Rerolled.
825
826
827
* bc/append-signed-off-by (2013-01-01) 12 commits
@@ -821,31 +842,6 @@ repositories listed at
842
$gmane/212507
843
844
824
-* mh/unify-xml-in-imap-send-and-http-push (2012-12-02) 8 commits
825
- (merged to 'next' on 2012-12-03 at d677090)
826
- + wrap_in_html(): process message in bulk rather than line-by-line
827
- + wrap_in_html(): use strbuf_addstr_xml_quoted()
828
- + imap-send: change msg_data from storing (ptr, len) to storing strbuf
829
- + imap-send: correctly report errors reading from stdin
830
- + imap-send: store all_msgs as a strbuf
831
- + lf_to_crlf(): NUL-terminate msg_data::data
832
- + xml_entities(): use function strbuf_addstr_xml_quoted()
833
- + Add new function strbuf_add_xml_quoted()
834
-
835
- Update imap-send to reuse xml quoting code from http-push codepath,
836
- clean up some code, and fix a small bug.
837
-
838
- Will merge to 'master'.
839
-
840
-
841
-* jk/fsck-dot-in-trees (2012-11-28) 2 commits
842
- (merged to 'next' on 2012-11-28 at 519dabc)
843
- + fsck: warn about ".git" in trees
844
- + fsck: warn about '.' and '..' in trees
845
-
846
- Will merge to 'master'.
847
-
848
-
845
* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits
846
(merged to 'next' on 2012-11-28 at 43d51c2)
847
+ config: exit on error accessing any config file
@@ -856,25 +852,6 @@ repositories listed at
852
Deal with a situation where .config/git is a file and we notice
853
.config/git/config is not readable due to ENOTDIR, not ENOENT.
854
859
-
860
-* fc/fast-export-fixes (2012-12-03) 15 commits
861
- (merged to 'next' on 2012-12-03 at f9df523)
862
- + fast-export: make sure updated refs get updated
863
- + fast-export: don't handle uninteresting refs
864
- + fast-export: fix comparison in tests
865
- + fast-export: trivial cleanup
866
- + remote-testgit: implement the "done" feature manually
867
- + remote-testgit: report success after an import
868
- + remote-testgit: exercise more features
869
- + remote-testgit: cleanup tests
870
- + remote-testgit: remove irrelevant test
871
- + remote-testgit: remove non-local functionality
872
- + Add new simplified git-remote-testgit
873
- + Rename git-remote-testgit to git-remote-testpy
874
- + remote-helpers: fix failure message
875
- + remote-testgit: fix direction of marks
876
- + fast-export: avoid importing blob marks
877
-
855
Will merge to 'master'.
856
857
@@ -886,14 +863,6 @@ repositories listed at
863
possibility that whitespace fix could shrink the preimage and
864
change the number of lines in it.
865
889
-
890
-* nd/pathspec-wildcard (2012-11-26) 4 commits
891
- (merged to 'next' on 2012-12-03 at eca0fcb)
892
- + tree_entry_interesting: do basedir compare on wildcard patterns when possible
893
- + pathspec: apply "*.c" optimization from exclude
894
- + pathspec: do exact comparison on the leading non-wildcard part
895
- + pathspec: save the non-wildcard length part
896
-
866
Will merge to 'master'.
867
868
@@ -926,20 +895,13 @@ repositories listed at
895
with double-asterisks "foo/**/bar" to match any number of directory
896
hierarchies.
897
898
+--------------------------------------------------
899
+[Discarded]
900
930
-* cr/push-force-tag-update (2012-12-03) 10 commits
931
- (merged to 'next' on 2012-12-04 at af2e3a9)
932
- + push: allow already-exists advice to be disabled
933
- + push: rename config variable for more general use
934
- + push: cleanup push rules comment
935
- + push: clarify rejection of update to non-commit-ish
936
- + push: require force for annotated tags
937
- + push: require force for refs under refs/tags/
938
- + push: flag updates that require force
939
- + push: keep track of "update" state separately
940
- + push: add advice for rejected tag reference
941
- + push: return reject reasons as a bitset
942
-
943
- Require "-f" for push to update a tag, even if it is a fast-forward.
901
+* jc/doc-default-format (2013-01-03) 2 commits
902
+ . Allow installing a non-default set of documentation
903
+ . Allow generating a non-default set of documentation
904
945
- Will merge to 'master'.
905
+ Instead of the default of generating html/man and installing man,
906
+ you can control what "make doc" and "make install-doc" do via two
907
+ make variables.