What's cooking/in

Junio C Hamano committed Mar 30, 2009 at 14:42 UTC 34838a2c2e13ee27a5e8b65691cb85ee963dbd54
2 files changed +699
whats/cooking/2009/03/07.txt new
+318
@@ -0,0 +1,318 @@
1 +To: git@vger.kernel.org
2 +Subject: What's cooking in git.git (Mar 2009, #07; Mon, 30)
3 +X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90
4 +X-next-at: 233382b233530fc38969fd1f31dec27e342c2a9f
5 +
6 +What's cooking in git.git (Mar 2009, #07; Mon, 30)
7 +--------------------------------------------------
8 +
9 +Here are the topics that have been cooking. Commits prefixed with '-' are
10 +only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11 +marked with '.' do not appear in any of the branches, but I am still
12 +holding onto them.
13 +
14 +The topics list the commits in reverse chronological order. The topics
15 +meant to be merged to the maintenance series have "maint-" in their names.
16 +
17 +----------------------------------------------------------------
18 +[New Topics]
19 +
20 +* cj/doc-format (Fri Mar 27 00:36:47 2009 -0700) 11 commits
21 + + Merge branch 'cj/doc-quiet' into cj/doc-format
22 + + Documentation: option to render literal text as bold for manpages
23 + + Documentation: asciidoc.conf: fix verse block with block titles
24 + + Documentation: asciidoc.conf: always use <literallayout> for
25 + [blocktext]
26 + + Documentation: move "spurious .sp" code into manpage-base.xsl
27 + + Documentation: move quieting params into manpage-base.xsl
28 + + Documentation: rename docbook-xsl-172 attribute to git-asciidoc-
29 + no-roff
30 + + Documentation: use parametrized manpage-base.xsl with manpage-
31 + {1.72,normal}.xsl
32 + + Documentation: move callouts.xsl to manpage-{base,normal}.xsl
33 + + Documentation/Makefile: break up texi pipeline
34 + + Documentation/Makefile: make most operations "quiet"
35 +
36 +* cj/doc-quiet (Fri Mar 27 01:49:39 2009 -0500) 2 commits
37 + + Documentation/Makefile: break up texi pipeline
38 + + Documentation/Makefile: make most operations "quiet"
39 +
40 +I think these are ready for 'master'.
41 +
42 +* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 3 commits
43 + - checkout -: make "-" to mean "previous branch" everywhere
44 + - Don't permit ref/branch names to end with ".lock"
45 + - check_ref_format(): tighten refname rules
46 +
47 +After all the bottom two are probably not so iffy.
48 +
49 +* jc/name-branch (Sat Mar 21 14:35:51 2009 -0700) 5 commits
50 + + strbuf_check_branch_ref(): a helper to check a refname for a
51 + branch
52 + + Fix branch -m @{-1} newname
53 + + check-ref-format --branch: give Porcelain a way to grok branch
54 + shorthand
55 + + strbuf_branchname(): a wrapper for branch name shorthands
56 + + Rename interpret/substitute nth_last_branch functions
57 +
58 +* sb/format-patch-patchname (Fri Mar 27 01:13:01 2009 +0100) 7 commits
59 + + log-tree: fix patch filename computation in "git format-patch"
60 + + format-patch: --numbered-files and --stdout aren't mutually
61 + exclusive
62 + + format-patch: --attach/inline uses filename instead of SHA1
63 + + format-patch: move get_patch_filename() into log-tree
64 + + format-patch: pass a commit to reopen_stdout()
65 + + format-patch: construct patch filename in one function
66 + + pretty.c: add %f format specifier to format_commit_message()
67 +
68 +* mg/tracked-local-branches (Thu Mar 26 21:53:25 2009 +0100) 2 commits
69 + - [Reroll requested] Make local branches behave like remote branches
70 + when --tracked
71 + - Test for local branches being followed with --track
72 +
73 +* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 15 commits
74 + - bisect--helper: string output variables together with "&&"
75 + - rev-list: pass "int flags" as last argument of "show_bisect_vars"
76 + - t6030: test bisecting with paths
77 + - bisect: use "bisect--helper" and remove "filter_skipped" function
78 + - bisect: implement "read_bisect_paths" to read paths in
79 + "$GIT_DIR/BISECT_NAMES"
80 + - bisect--helper: implement "git bisect--helper"
81 + - rev-list: call new "filter_skip" function
82 + + rev-list: pass "revs" to "show_bisect_vars"
83 + + rev-list: make "show_bisect_vars" non static
84 + + rev-list: move code to show bisect vars into its own function
85 + + rev-list: move bisect related code into its own file
86 + + rev-list: make "bisect_list" variable local to "cmd_rev_list"
87 + + refs: add "for_each_ref_in" function to refactor "for_each_*_ref"
88 + functions
89 + + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv
90 + array
91 + + quote: implement "sq_dequote_many" to unwrap many args in one
92 + string
93 +
94 +I've reordered them to make the early three patches independent to the
95 +rest of the series. Dscho had a suggestion on the search it internally
96 +does, so we might see further reroll of some patches in the series.
97 +
98 +* jc/shared-literally (Fri Mar 27 23:21:00 2009 -0700) 4 commits
99 + + set_shared_perm(): sometimes we know what the final mode bits
100 + should look like
101 + + move_temp_to_file(): do not forget to chmod() in "Coda hack"
102 + codepath
103 + + Move chmod(foo, 0444) into move_temp_to_file()
104 + + "core.sharedrepository = 0mode" should set, not loosen
105 +
106 +* tr/maint-1.6.1-doc-format-patch--root (Thu Mar 26 18:29:25 2009 +0100) 1 commit
107 + + Documentation: format-patch --root clarifications
108 +
109 +* mh/format-patch-add-header (Thu Mar 26 10:51:05 2009 -0600) 1 commit
110 + + format-patch: add arbitrary email headers
111 +
112 +* ef/fast-export (Mon Mar 23 12:53:09 2009 +0000) 4 commits
113 + + builtin-fast-export.c: handle nested tags
114 + + builtin-fast-export.c: fix crash on tagged trees
115 + + builtin-fast-export.c: turn error into warning
116 + + test-suite: adding a test for fast-export with tag variants
117 +
118 +----------------------------------------------------------------
119 +[Graduated to "master"]
120 +
121 +* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit
122 + + make oneline reflog dates more consistent with multiline format
123 +
124 +* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit
125 + + export GIT_EXEC_PATH when git is run with --exec-path
126 +
127 +* jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit
128 + + blame: read custom grafts given by -S before calling
129 + setup_revisions()
130 +
131 +The above are all ready for 'next'.
132 +
133 +* dm/maint-docco (Thu Mar 19 20:35:34 2009 -0700) 6 commits
134 + + Documentation: reword example text in git-bisect.txt.
135 + + Documentation: reworded the "Description" section of git-
136 + bisect.txt.
137 + + Documentation: minor grammatical fixes in git-branch.txt.
138 + + Documentation: minor grammatical fixes in git-blame.txt.
139 + + Documentation: reword the "Description" section of git-bisect.txt.
140 + + Documentation: minor grammatical fixes in git-archive.txt.
141 +
142 +* mg/test-installed (Mon Mar 16 18:03:12 2009 +0100) 2 commits
143 + + test-lib.sh: Allow running the test suite against installed git
144 + + test-lib.sh: Test for presence of git-init in the right path.
145 +
146 +* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits
147 + + Add a test for checking whether gitattributes is honored by
148 + checkout.
149 + + Read attributes from the index that is being checked out
150 +
151 +Original issue identified, and test provided by Kristian Amlie.
152 +
153 +* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits
154 + + Display warning for default git push with no push.default config
155 + + New config push.default to decide default behavior for push
156 +
157 +* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits
158 + + http-push.c: use a faux remote to pass to http_init
159 + + Do not name "repo" struct "remote" in push_http.c
160 + + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient
161 + versions of cURL
162 + + http authentication via prompts
163 + + http_init(): Fix config file parsing
164 + + http.c: style cleanups
165 +
166 +Amos King added push side support on top of my fetch side support.
167 +
168 +We may want to also pass --remote parameter from git-push to this backend
169 +as Daniel did as an interim solution for the fetch side, so that we can
170 +handle the configuration better.
171 +
172 +* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits
173 + + Move push matching and reporting logic into transport.c
174 + + Use a common function to get the pretty name of refs
175 +
176 +----------------------------------------------------------------
177 +[Will merge to 'master' soon]
178 +
179 +* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit
180 + + stat_tracking_info(): only count real commits
181 +
182 +This gives the merge commits zero weight when talking about how many
183 +commits you have ahead (or behind) of the branch you are tracking. Even
184 +though I agree that they should carry much less weight than the "real"
185 +commits, because your repeated merge from the other branch does not really
186 +add any real value to the end result, giving them absolute zero weight
187 +somehow feels wrong. At least it shows that your have been _active_ on the
188 +branch. But I do not feel very strongly about it.
189 +
190 +* jc/maint-1.6.0-keep-pack (Sat Mar 21 17:26:11 2009 -0500) 6 commits
191 + + pack-objects: don't loosen objects available in alternate or kept
192 + packs
193 + + t7700: demonstrate repack flaw which may loosen objects
194 + unnecessarily
195 + + Remove --kept-pack-only option and associated infrastructure
196 + + pack-objects: only repack or loosen objects residing in "local"
197 + packs
198 + + git-repack.sh: don't use --kept-pack-only option to pack-objects
199 + + t7700-repack: add two new tests demonstrating repacking flaws
200 +
201 +----------------------------------------------------------------
202 +[Stalled and may need help and prodding to go forward]
203 +
204 +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit
205 + - blame.c: start libifying the blame infrastructure
206 +
207 +A few minor point remains in this initial one.
208 +
209 +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
210 + - Allow --date=local --date=other-format to work as expected
211 +
212 +The one I posted had a few corner-case bugs that was caught with the test
213 +suite; this one has them fixed. People did not like the UI so it is kept
214 +out of 'next'
215 +
216 +* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit
217 + - archive.c: add support for --submodules[=(all|checkedout)]
218 +
219 +Discussion stalled on the submodule selection criteria.
220 +Probably I should discard it and wait for a reroll if needed.
221 +
222 +* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
223 + - git-merge-file: allow converting the results for the work tree
224 +
225 +This is a feature waiting for a user.
226 +
227 +We did not give scripted Porcelains a way to say "this temporary file I am
228 +using for merging is for this path, so use the core.autocrlf and attributes
229 +rules for that final path". Instead, merge-file simply wrote out the
230 +data in the canonical repository representation.
231 +
232 +rerere has the same issue, but it is a lot worse. It reads the three
233 +files (preimage, postimage and thisimage) from the work tree in the work
234 +tree representation, merges them without converting them to the canonical
235 +representation first but inserts the conflict markers with the canonical
236 +representation and writes the resulting mess out. It needs to be fixed to
237 +read with convert_to_git(), merge them while they are still in the
238 +canonical representation and possibly add conflict markers, and then write
239 +the results out after convert_to_working_tree(). It also needs to write
240 +in binary mode as well.
241 +
242 +* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
243 + - Support fetching from foreign VCSes
244 + - Add specification of git-vcs helpers
245 + - Add "vcs" config option in remotes
246 +
247 +* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits
248 + - builtin-replace: use "usage_msg_opt" to give better error messages
249 + - parse-options: add new function "usage_msg_opt"
250 + - builtin-replace: teach "git replace" to actually replace
251 + - Add new "git replace" command
252 + - environment: add global variable to disable replacement
253 + - mktag: call "check_sha1_signature" with the replacement sha1
254 + - replace_object: add a test case
255 + - object: call "check_sha1_signature" with the replacement sha1
256 + - sha1_file: add a "read_sha1_file_repl" function
257 + - replace_object: add mechanism to replace objects found in
258 + "refs/replace/"
259 + - refs: add a "for_each_replace_ref" function
260 +
261 +I know, I really have to drop everything else and re-read these, but I
262 +haven't managed to.
263 +
264 +* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits
265 + - tests: fix "export var=val"
266 + - notes: refuse to edit notes outside refs/notes/
267 + - t3301: use test_must_fail instead of !
268 + - t3301: fix confusing quoting in test for valid notes ref
269 + - notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR
270 + - notes: only clean up message file when editing
271 + - handle empty notes gracefully
272 + - git notes show: test empty notes
273 + - git-notes: fix printing of multi-line notes
274 + - notes: fix core.notesRef documentation
275 + - Add an expensive test for git-notes
276 + - Speed up git notes lookup
277 + - Add a script to edit/inspect notes
278 + - Introduce commit notes
279 +
280 +* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits
281 + - cvsimport: extend testcase about patchset order to contain
282 + branches
283 + - cvsimport: add test illustrating a bug in cvsps
284 + - Add a test of "git cvsimport"'s handling of tags and branches
285 + - Add some tests of git-cvsimport's handling of vendor branches
286 + - Test contents of entire cvsimported "master" tree contents
287 + - Use CVS's -f option if available (ignore user's ~/.cvsrc file)
288 + - Start a library for cvsimport-related tests
289 +
290 +Two cvsimport test topics were rewound from 'next' and merged into this
291 +one. I'll keep this in 'pu' so that people can polish their cvsps skilz
292 +to resolve issues these tests identify.
293 +
294 +----------------------------------------------------------------
295 +[Actively cooking]
296 +
297 +* da/difftool (Tue Mar 24 23:29:59 2009 -0700) 5 commits
298 + - difftool: add a -y shortcut for --no-prompt
299 + - difftool: use perl built-ins when testing for msys
300 + - difftool: add various git-difftool tests
301 + - difftool: add git-difftool to the list of commands
302 + + difftool: move 'git-difftool' out of contrib
303 +
304 +David has further refactoring which was a bit too early for me to pick
305 +up.
306 +
307 +----------------------------------------------------------------
308 +[On Hold]
309 +
310 +* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit
311 + - receive-pack: default receive.denyDeleteCurrent to refuse
312 +
313 +* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit
314 + - Refuse updating the current branch in a non-bare repository via
315 + push
316 +
317 +These are for 1.7.0, but the messages when they trigger together may need
318 +to be rethought.
whats/in/2009/03/06.txt new
+381
@@ -0,0 +1,381 @@
1 +To: git@vger.kernel.org
2 +Subject: What's in git.git (Mar 2009, #06; Mon, 30)
3 +X-maint-at: 8c7f78823888306c1cceafcf5fd26739eef99ce3
4 +X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90
5 +X-maint-was: a54a216098db10d551d33123f33667ce8a036510
6 +X-master-was: bba2a7b22fdde7a214516e93d957a950571a2026
7 +
8 +What's in git.git (Mar 2009, #06; Mon, 30)
9 +
10 + maint 8c7f788 (Update draft release notes to 1.6.2.2)
11 + master 442dd42 (Merge branch 'maint')
12 +------------------------------------------------------------------------
13 +
14 +Many small updates on the 'master' front. I think we can declare feature
15 +freeze for 1.6.3 in about a week, tag -rc0, and keep topics that are still
16 +in 'pu' cooking for 1.6.4 (there are some good ones).
17 +
18 +* The 'maint' branch has these fixes since the last announcement.
19 +
20 +Allan Caffee (1):
21 + Documentation: update graph api example.
22 +
23 +Carlo Marcelo Arenas Belon (1):
24 + documentation: update cvsimport description of "-r" for recent clone
25 +
26 +Daniel Barkalow (1):
27 + Give error when no remote is configured
28 +
29 +Daniel Cheng (aka SDiZ) (1):
30 + Fix bash completion in path with spaces
31 +
32 +David Aguilar (1):
33 + everyday: use the dashless form of git-init
34 +
35 +Emil Sit (1):
36 + test-lib: Clean up comments and Makefile.
37 +
38 +Eric Wong (1):
39 + git-svn: fix ls-tree usage with dash-prefixed paths
40 +
41 +Jeff King (2):
42 + doc: clarify how -S works
43 + ls-files: require worktree when --deleted is given
44 +
45 +Johannes Schindelin (2):
46 + rsync transport: allow local paths, and fix tests
47 + import-zips: fix thinko
48 +
49 +Johannes Sixt (1):
50 + diff --no-index: Do not generate patch output if other output is
51 + requested
52 +
53 +Junio C Hamano (5):
54 + read-tree A B C: do not create a bogus index and do not segfault
55 + GIT 1.6.2.1
56 + Remove total confusion from git-fetch and git-push
57 + Update draft release notes to 1.6.2.2
58 + Update draft release notes to 1.6.2.2
59 +
60 +Linus Torvalds (1):
61 + close_sha1_file(): make it easier to diagnose errors
62 +
63 +Michael J Gruber (2):
64 + git submodule: Add test cases for git submodule add
65 + git submodule: Fix adding of submodules at paths with ./, .. and //
66 +
67 +Nico -telmich- Schottelius (1):
68 + git-tag(1): add hint about commit messages
69 +
70 +Nicolas Pitre (1):
71 + avoid possible overflow in delta size filtering computation
72 +
73 +René Scharfe (3):
74 + diffcore-pickaxe: use memmem()
75 + optimize compat/ memmem()
76 + pickaxe: count regex matches only once
77 +
78 +Shawn O. Pearce (1):
79 + Increase the size of the die/warning buffer to avoid truncation
80 +
81 +Stephen Boyd (1):
82 + format-patch: --numbered-files and --stdout aren't mutually exclusive
83 +
84 +Thomas Rast (3):
85 + send-email: respect in-reply-to regardless of threading
86 + send-email: test --no-thread --in-reply-to combination
87 + bash completion: only show 'log --merge' if merging
88 +
89 +
90 +* The 'master' branch has these since the last announcement
91 + in addition to the above.
92 +
93 +Alex Riesen (4):
94 + disable post-checkout test on Cygwin
95 + Produce a nicer output in case of sha1_object_info failures in ls-tree -l
96 + Microoptimize strbuf_cmp
97 + Improve error message about fetch into current branch
98 +
99 +Amos King (2):
100 + Do not name "repo" struct "remote" in push_http.c
101 + http-push.c: use a faux remote to pass to http_init
102 +
103 +Arto Jonsson (1):
104 + bash completion: add options for 'git fsck'
105 +
106 +Ben Walton (7):
107 + configure: ensure settings from user are also usable in the script
108 + configure: reorganize flow of argument checks
109 + configure: add macros to stash FLAG variables
110 + configure: wrap some library tests with GIT_STASH_FLAGS
111 + configure: asciidoc version test cleanup
112 + configure: make iconv tests aware of user arguments
113 + configure: rework pthread handling to allow for user defined flags
114 +
115 +Benjamin Kramer (1):
116 + Fix various dead stores found by the clang static analyzer
117 +
118 +Brandon Casey (2):
119 + git-branch: display "was sha1" on branch deletion rather than just "sha1"
120 + builtin-send-pack.c: avoid empty structure initialization
121 +
122 +Brian Gernhardt (2):
123 + Create USE_ST_TIMESPEC and turn it on for Darwin
124 + Makefile: Set compiler switch for USE_NSEC
125 +
126 +Carlos Rica (1):
127 + config: test for --replace-all with one argument and fix documentation.
128 +
129 +Chris Johnsen (2):
130 + git-push.txt: describe how to default to pushing only current branch
131 + Documentation: remove extra quoting/emphasis around literal texts
132 +
133 +Daniel Barkalow (7):
134 + Make clone parse the default refspec with the normal code
135 + Use a single function to match names against patterns
136 + Use the matching function to generate the match results
137 + Keep '*' in pattern refspecs
138 + Support '*' in the middle of a refspec
139 + Use a common function to get the pretty name of refs
140 + Move push matching and reporting logic into transport.c
141 +
142 +David J. Mellor (12):
143 + Documentation: minor grammatical fixes in git-archive.txt.
144 + Documentation: reword the "Description" section of git-bisect.txt.
145 + Documentation: minor grammatical fixes in git-blame.txt.
146 + Documentation: minor grammatical fixes in git-branch.txt.
147 + Documentation: reworded the "Description" section of git-bisect.txt.
148 + Documentation: reword example text in git-bisect.txt.
149 + Documentation: remove some uses of the passive voice in git-bisect.txt
150 + Documentation: minor grammatical fixes and rewording in git-bundle.txt
151 + Documentation: minor grammatical fixes in git-cat-file.txt
152 + Documentation: minor grammatical fixes in git-check-attr.txt
153 + Documentation: minor grammatical fix in git-check-ref-format.txt
154 + Documentation: Remove spurious uses of "you" in git-bisect.txt.
155 +
156 +Elijah Newren (3):
157 + git-filter-branch: avoid collisions with variables in eval'ed commands
158 + Correct missing SP characters in grammar comment at top of fast-import.c
159 + fast-export: Avoid dropping files from commits
160 +
161 +Emil Sit (1):
162 + config.txt: Describe special 'none' handling in core.gitProxy.
163 +
164 +Eric Wong (1):
165 + git-svn: fix ls-tree usage with dash-prefixed paths
166 +
167 +Felipe Contreras (8):
168 + git_config(): not having a per-repo config file is not an error
169 + git config: trivial rename in preparation for parseopt
170 + git config: reorganize get_color*
171 + git config: reorganize to use parseopt
172 + git config: don't allow multiple config file locations
173 + git config: don't allow multiple variable types
174 + git config: don't allow extra arguments for -e or -l.
175 + git config: don't allow --get-color* and variable type
176 +
177 +Finn Arne Gangstad (2):
178 + New config push.default to decide default behavior for push
179 + Display warning for default git push with no push.default config
180 +
181 +Giuseppe Bilotta (1):
182 + import-tars: separate author from committer
183 +
184 +Heiko Voigt (1):
185 + Add warning about known issues to documentation of cvsimport
186 +
187 +Janos Laube (1):
188 + MinGW: implement mmap
189 +
190 +Jay Soffian (20):
191 + move duplicated get_local_heads() to remote.c
192 + move duplicated ref_newer() to remote.c
193 + move locate_head() to remote.c
194 + remote: simplify guess_remote_head()
195 + remote: make copy_ref() perform a deep copy
196 + remote: let guess_remote_head() optionally return all matches
197 + remote: make match_refs() copy src ref before assigning to peer_ref
198 + remote: make match_refs() not short-circuit
199 + string-list: new for_each_string_list() function
200 + builtin-remote: refactor duplicated cleanup code
201 + builtin-remote: remove unused code in get_ref_states
202 + builtin-remote: rename variables and eliminate redundant function call
203 + builtin-remote: make get_remote_ref_states() always populate
204 + states.tracked
205 + builtin-remote: fix two inconsistencies in the output of "show <remote>"
206 + builtin-remote: teach show to display remote HEAD
207 + builtin-remote: add set-head subcommand
208 + builtin-remote: new show output style
209 + builtin-remote: new show output style for push refspecs
210 + send-email: refactor and ensure prompting doesn't loop forever
211 + send-email: add tests for refactored prompting
212 +
213 +Jeff King (12):
214 + test scripts: refactor start_httpd helper
215 + add basic http clone/fetch tests
216 + refactor find_ref_by_name() to accept const list
217 + remote: make guess_remote_head() use exact HEAD lookup if it is available
218 + config: set help text for --bool-or-int
219 + t3000: use test_cmp instead of diff
220 + ls-files: fix broken --no-empty-directory
221 + ls-files: require worktree when --deleted is given
222 + make oneline reflog dates more consistent with multiline format
223 + remote: improve sorting of "configure for git push" list
224 + Makefile: turn on USE_ST_TIMESPEC for FreeBSD
225 + t0060: fix whitespace in "wc -c" invocation
226 +
227 +Jens Lehmann (1):
228 + githooks documentation: post-checkout hook is also called after clone
229 +
230 +Johannes Schindelin (7):
231 + Turn the flags in struct dir_struct into a single variable
232 + rebase -i: avoid 'git reset' when possible
233 + winansi: support ESC [ K (erase in line)
234 + gc --aggressive: make it really aggressive
235 + t7300: fix clean up on Windows
236 + Smudge the files fed to external diff and textconv
237 + Guard a few Makefile variables against user environments
238 +
239 +Johannes Sixt (30):
240 + recv_sideband: Bands #2 and #3 always go to stderr
241 + t9400, t9401: Do not force hard-linked clone
242 + test suite: Use 'say' to say something instead of 'test_expect_success'
243 + Call 'say' outside test_expect_success
244 + test-lib: Replace uses of $(expr ...) by POSIX shell features.
245 + test-lib: Simplify test counting.
246 + test-lib: Introduce test_chmod and use it instead of update-index --chmod
247 + t2200, t7004: Avoid glob pattern that also matches files
248 + t5300, t5302, t5303: Do not use /dev/zero
249 + t5602: Work around path mangling on MSYS
250 + test-lib: Work around incompatible sort and find on Windows
251 + test-lib: Work around missing sum on Windows
252 + Tests on Windows: $(pwd) must return Windows-style paths
253 + t0050: Check whether git init detected symbolic link support correctly
254 + test-lib: Infrastructure to test and check for prerequisites
255 + Propagate --exec-path setting to external commands via GIT_EXEC_PATH
256 + t3600: Use test prerequisite tags
257 + Skip tests that fail if the executable bit is not handled by the
258 + filesystem
259 + t5302: Use prerequisite tags to skip 64-bit offset tests
260 + t9100, t9129: Use prerequisite tags for UTF-8 tests
261 + Use prerequisite tags to skip tests that depend on symbolic links
262 + t0060: Fix tests on Windows
263 + Skip tests that require a filesystem that obeys POSIX permissions
264 + t3700: Skip a test with backslashes in pathspec
265 + Use prerequisites to skip tests that need unzip
266 + t7004: Use prerequisite tags to skip tests that need gpg
267 + t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW
268 + MinGW: Quote arguments for subprocesses that contain a single-quote
269 + t7005-editor: Use $SHELL_PATH in the editor scripts
270 + t7502-commit: Skip SIGTERM test on Windows
271 +
272 +Junio C Hamano (15):
273 + Make git-clone respect branch.autosetuprebase
274 + builtin-remote.c: no "commented out" code, please
275 + Not all systems use st_[cm]tim field for ns resolution file timestamp
276 + grep: cast printf %.*s "precision" argument explicitly to int
277 + http.c: style cleanups
278 + Improve "git branch --tracking" output
279 + http_init(): Fix config file parsing
280 + http authentication via prompts
281 + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of
282 + cURL
283 + Read attributes from the index that is being checked out
284 + Update draft release notes to 1.6.3
285 + blame: read custom grafts given by -S before calling setup_revisions()
286 + http tests: Darwin is not that special
287 + diff --cached: do not borrow from a work tree when a path is marked as
288 + assume-unchanged
289 + Update draft release notes to 1.6.3
290 +
291 +Kevin Ballard (1):
292 + builtin-push.c: Fix typo: "anythig" -> "anything"
293 +
294 +Kevin McConnell (1):
295 + Add --staged to bash completion for git diff
296 +
297 +Kjetil Barvik (17):
298 + lstat_cache(): small cleanup and optimisation
299 + lstat_cache(): generalise longest_match_lstat_cache()
300 + lstat_cache(): swap func(length, string) into func(string, length)
301 + unlink_entry(): introduce schedule_dir_for_removal()
302 + create_directories(): remove some memcpy() and strchr() calls
303 + write_entry(): cleanup of some duplicated code
304 + write_entry(): use fstat() instead of lstat() when file is open
305 + show_patch_diff(): remove a call to fstat()
306 + lstat_cache(): print a warning if doing ping-pong between cache types
307 + check_updates(): effective removal of cache entries marked CE_REMOVE
308 + fix compile error when USE_NSEC is defined
309 + make USE_NSEC work as expected
310 + verify_uptodate(): add ce_uptodate(ce) test
311 + write_index(): update index_state->timestamp after flushing to disk
312 + Record ns-timestamps if possible, but do not use it without USE_NSEC
313 + checkout bugfix: use stat.mtime instead of stat.ctime in two places
314 + Revert "lstat_cache(): print a warning if doing ping-pong between cache
315 + types"
316 +
317 +Kristian Amlie (1):
318 + Add a test for checking whether gitattributes is honored by checkout.
319 +
320 +Michael J Gruber (3):
321 + test-lib.sh: Test for presence of git-init in the right path.
322 + test-lib.sh: Allow running the test suite against installed git
323 + git-branch.txt: document -f correctly
324 +
325 +Michele Ballabio (6):
326 + apply: consistent spelling of "don't"
327 + apply: hide unused options from short help
328 + git log: avoid segfault with --all-match
329 + document --force-rebase
330 + rebase: add options passed to git-am
331 + rebase: fix typo (force_rebas -> force-rebas)
332 +
333 +Miklos Vajna (11):
334 + parse-opt: migrate builtin-ls-files.
335 + Tests: use test_cmp instead of diff where possible
336 + http-push: using error() and warning() as appropriate
337 + builtin-apply: use warning() instead of fprintf(stderr, "warning: ")
338 + builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
339 + builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")
340 + builtin-init-db: use warning() instead of fprintf(stderr, "warning: ")
341 + builtin-rm: use warning() instead of fprintf(stderr, "warning: ")
342 + builtin-show-branch: use warning() instead of fprintf(stderr, "warning:
343 + ")
344 + builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")
345 + refs: use warning() instead of fprintf(stderr, "warning: ")
346 +
347 +Nate Case (1):
348 + format-patch: Respect --quiet option
349 +
350 +Nguyễn Thái Ngọc Duy (1):
351 + grep: prefer builtin over external one when coloring results
352 +
353 +Petr Kodl (2):
354 + MinGW: a helper function that translates Win32 API error codes
355 + MinGW: a hardlink implementation
356 +
357 +René Scharfe (6):
358 + grep: micro-optimize hit collection for AND nodes
359 + grep: remove grep_opt argument from match_expr_eval()
360 + grep: add pmatch and eflags arguments to match_one_pattern()
361 + grep: color patterns in output
362 + grep: add support for coloring with external greps
363 + pickaxe: count regex matches only once
364 +
365 +Santi Béjar (2):
366 + Documentation: enhance branch.<name>.{remote,merge}
367 + Documentation: push.default applies to all remotes
368 +
369 +Simon Arlott (1):
370 + git-svn: don't output git commits in quiet mode
371 +
372 +Stephen Boyd (4):
373 + git-send-email.txt: describe --compose better
374 + completion: add --annotate option to send-email
375 + completion: add --cc and --no-attachment option to format-patch
376 + completion: add --thread=deep/shallow to format-patch
377 +
378 +Wincent Colaiuta (2):
379 + Grammar fixes to "merge" and "patch-id" docs
380 + Grammar fix for "git merge" man page
381 +