Meta/Make: update OpenBSD specific tweaks

Junio C Hamano committed Dec 20, 2012 at 19:58 UTC 9f15e7532cb4386cbda108e2f5dbc37bbfdc0717
2 files changed +151 -104
Make
+2 -5
@@ -59,11 +59,8 @@ done
59 Wall='-Wall -Wdeclaration-after-statement' tests= jobs= skip= oldtest=
60 case `uname` in
61 OpenBSD)
62 - NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
63 - skip="t9200 t9502"
64 - SHELL_PATH=/usr/local/bin/bash; export SHELL_PATH
65 - NO_PEDANTIC=CannotDo NO_JOBS=CannotDo
66 - Wall=
62 + O="-fgnu89-inline"
63 + skip="t9402"
64 ;;
65 FreeBSD)
66 OLD_ICONV=YesPlease; export OLD_ICONV
whats-cooking.txt
+149 -99
@@ -1,22 +1,16 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Dec 2012, #05; Tue, 18)
4 -X-master-at: b7cd0c9b692af7728a1d876a3e4fe760956e00c3
5 -X-next-at: c92fcd913d6db915141f6e28e838c7976a746786
3 +Subject: What's cooking in git.git (Dec 2012, #06; Wed, 19)
4 +X-master-at: 18499ba694711c02a5bc729b7f8e362dd760b10a
5 +X-next-at: 82c5000aef763fdc977dac25e6b06ac4de5787dd
6
7 -What's cooking in git.git (Dec 2012, #05; Tue, 18)
7 +What's cooking in git.git (Dec 2012, #06; Wed, 19)
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 tip of the 'master' branch is a bit past 1.8.1-rc2; hopefully we
15 -can go final around the end of the week.
16 -
17 -Many topics are getting into good shape in 'next', hopefully ready
18 -to be merged soon after the 1.8.1 final.
19 -
14 You can find the changes described here in the integration branches of the
15 repositories listed at
16
@@ -25,72 +19,45 @@ repositories listed at
19 --------------------------------------------------
20 [New Topics]
21
28 -* cc/no-gitk-build-dependency (2012-12-18) 3 commits
29 - - Makefile: replace "echo 1>..." with "echo >..."
30 - - Makefile: detect when PYTHON_PATH changes
31 - - Makefile: remove tracking of TCLTK_PATH
22 +* jc/mkstemp-more-careful-error-reporting (2012-12-18) 1 commit
23 + - xmkstemp(): avoid showing truncated template more carefully
24
33 - Remove leftover bits from an earlier change to move gitk in its own
34 - subdirectory. Reimplementing the dependency tracking rules needs
35 - to be done in gitk history separately.
25 + An earlier patch to save original arguments to mkstemp() away and
26 + use it to report what filename we failed to create incorrectly used
27 + the buffer munged by failing mkstemp().
28
29
38 -* cr/doc-checkout-branch (2012-12-18) 2 commits
39 - - Documentation/git-checkout.txt: document 70c9ac2 behavior
40 - - Documentation/git-checkout.txt: clarify usage
30 +* jc/maint-test-portability (2012-12-19) 3 commits
31 + - t4014: fix arguments to grep
32 + - t9502: do not assume GNU tar
33 + - t0200: "locale" may not exist
34 + (this branch is used by jc/test-portability.)
35
42 - Document the magic "git checkout <no-such-branch>" hack to create
43 - local branch out of a remote tracking branch that hasn't been
44 - documented so far.
36 + Minor test fixes noticed while running our tests on OpenBSD 5.2,
37 + applicable to 'maint'.
38
46 - Will merge to 'next'.
39
40 +* jc/test-portability (2012-12-19) 3 commits
41 + - t9020: use configured Python to run the test helper
42 + - t3600: Avoid "cp -a", which is a GNUism
43 + - Merge branch 'jc/maint-test-portability' into 'jc/test-portability'
44 + (this branch uses jc/maint-test-portability.)
45
49 -* jc/format-color-auto (2012-12-17) 2 commits
50 - - log --format: teach %C(auto,black) to respect color config
51 - - t6006: clean up whitespace
46 + The remainder of jc/maint-test-portability, applicable to 'master'.
47
53 - Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does
54 - not color its output when writing to a non-terminal.
48
56 - Will merge to 'next'.
49 +* jc/maint-fnmatch-old-style-definition (2012-12-19) 1 commit
50 + - compat/fnmatch: update old-style definition to ANSI
51
52 + Update old-style function definition "int foo(bar) int bar; {}"
53 + to "int foo(int bar) {}".
54
59 -* ss/svn-prompt (2012-12-17) 3 commits
60 - - git-svn, perl/Git.pm: extend and use Git->prompt method for querying users
61 - - perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
62 - - git-svn, perl/Git.pm: add central method for prompting passwords
55
64 - Waiting for an Ack from the area export.
56 +* jk/pathspec-literal (2012-12-19) 1 commit
57 + - add global --literal-pathspecs option
58
66 -
67 -* zk/clean-report-failure (2012-12-17) 1 commit
68 - - git-clean: Display more accurate delete messages
69 -
70 - "git clean" states what it is going to remove and then goes on to
71 - remove it, but sometimes it only discovers things that cannot be
72 - removed after recursing into a directory, which makes the output
73 - confusing and even wrong.
74 -
75 - Waiting for responses to review comments.
76 -
77 -
78 -* jc/doc-diff-blobs (2012-12-18) 1 commit
79 - - Documentation: Describe "git diff <blob> <blob>" separately
80 -
81 - "git diff <blob> <blob>" was not documented and was only hinted as
82 - an extension to "git diff <commit> <commit> -- <pathspec>", but
83 - comparison between two blobs are more special than that. It does
84 - not take any pathspec to begin with.
85 -
86 -
87 -* mp/complete-paths (2012-12-18) 1 commit
88 - - git-completion.bash: add support for path completion
89 -
90 - The completion script used to let the default completer to suggest
91 - pathnames, which gave too many irrelevant choices (e.g. "git add"
92 - would not want to add an unmodified path). Teach it to use a more
93 - git-aware logic to enumerate only relevant ones.
59 + Allow scripts to feed literal paths to commands that take
60 + pathspecs, by disabling wildcard globbing.
61
62 --------------------------------------------------
63 [Stalled]
@@ -300,6 +267,86 @@ repositories listed at
267 --------------------------------------------------
268 [Cooking]
269
270 +* wk/submodule-update-remote (2012-12-19) 3 commits
271 + - submodule add: If --branch is given, record it in .gitmodules
272 + - submodule update: add --remote for submodule's upstream changes
273 + - submodule: add get_submodule_config helper funtion
274 +
275 + The beginning of 'integrate with the tip of the remote branch, not
276 + the commit recorded in the superproject gitlink' support.
277 +
278 +
279 +* cc/no-gitk-build-dependency (2012-12-18) 3 commits
280 + - Makefile: replace "echo 1>..." with "echo >..."
281 + - Makefile: detect when PYTHON_PATH changes
282 + - Makefile: remove tracking of TCLTK_PATH
283 +
284 + Remove leftover bits from an earlier change to move gitk in its own
285 + subdirectory. Reimplementing the dependency tracking rules needs
286 + to be done in gitk history separately.
287 +
288 +
289 +* cr/doc-checkout-branch (2012-12-18) 2 commits
290 + (merged to 'next' on 2012-12-19 at e14b6c4)
291 + + Documentation/git-checkout.txt: document 70c9ac2 behavior
292 + + Documentation/git-checkout.txt: clarify usage
293 +
294 + Document the magic "git checkout <no-such-branch>" hack to create
295 + local branch out of a remote tracking branch that hasn't been
296 + documented so far.
297 +
298 + May want to fast-track to the upcoming release.
299 +
300 +
301 +* jc/format-color-auto (2012-12-17) 2 commits
302 + (merged to 'next' on 2012-12-18 at 5aaac94)
303 + + log --format: teach %C(auto,black) to respect color config
304 + + t6006: clean up whitespace
305 +
306 + Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does
307 + not color its output when writing to a non-terminal.
308 +
309 +
310 +* ss/svn-prompt (2012-12-17) 3 commits
311 + - git-svn, perl/Git.pm: extend and use Git->prompt method for querying users
312 + - perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
313 + - git-svn, perl/Git.pm: add central method for prompting passwords
314 +
315 + Waiting for an Ack from the area export.
316 +
317 +
318 +* zk/clean-report-failure (2012-12-17) 1 commit
319 + - git-clean: Display more accurate delete messages
320 +
321 + "git clean" states what it is going to remove and then goes on to
322 + remove it, but sometimes it only discovers things that cannot be
323 + removed after recursing into a directory, which makes the output
324 + confusing and even wrong.
325 +
326 + Waiting for responses to review comments.
327 +
328 +
329 +* jc/doc-diff-blobs (2012-12-18) 1 commit
330 + (merged to 'next' on 2012-12-19 at 82c5000)
331 + + Documentation: Describe "git diff <blob> <blob>" separately
332 +
333 + "git diff <blob> <blob>" was not documented and was only hinted as
334 + an extension to "git diff <commit> <commit> -- <pathspec>", but
335 + comparison between two blobs are more special than that. It does
336 + not take any pathspec to begin with.
337 +
338 + May want to fast-track to the upcoming release.
339 +
340 +
341 +* mp/complete-paths (2012-12-19) 1 commit
342 + - git-completion.bash: add support for path completion
343 +
344 + The completion script used to let the default completer to suggest
345 + pathnames, which gave too many irrelevant choices (e.g. "git add"
346 + would not want to add an unmodified path). Teach it to use a more
347 + git-aware logic to enumerate only relevant ones.
348 +
349 +
350 * ja/directory-attrs (2012-12-17) 1 commit
351 (merged to 'next' on 2012-12-17 at ced8e73)
352 + Add directory pattern matching to attributes
@@ -321,6 +368,8 @@ repositories listed at
368
369 Update various entries in our .mailmap file.
370
371 + May want to fast-track to the upcoming release.
372 +
373
374 * jk/mailmap-from-blob (2012-12-13) 5 commits
375 (merged to 'next' on 2012-12-17 at 14b7cdc)
@@ -339,22 +388,26 @@ repositories listed at
388 (merged to 'next' on 2012-12-17 at 7984924)
389 + index-format.txt: clarify what is "invalid"
390
391 + May want to fast-track to the upcoming release.
392 +
393
394 * as/doc-for-devs (2012-12-16) 2 commits
344 - - Documentation: move support for old compilers to CodingGuidelines
345 - - SubmittingPatches: add convention of prefixing commit messages
395 + (merged to 'next' on 2012-12-18 at ff1f37e)
396 + + Documentation: move support for old compilers to CodingGuidelines
397 + + SubmittingPatches: add convention of prefixing commit messages
398
399 It might be a better idea to move the text the bottom one adds to
400 the extended description from the quick checklist part.
401
350 - Will merge to 'next'.
402 + May want to fast-track to the upcoming release.
403
404
353 -* dm/port (2012-12-18) 4 commits
405 +* dm/port (2012-12-19) 4 commits
406 - git-compat-util.h: do not #include <sys/param.h> by default
407 - Generalize the inclusion of strings.h
408 - Detect when the passwd struct is missing pw_gecos
409 - Support builds when sys/param.h is missing
410 + (this branch is used by mk/qnx.)
411
412 Will merge to 'next'.
413
@@ -363,28 +416,29 @@ repositories listed at
416 (merged to 'next' on 2012-12-17 at 857413a)
417 + fetch --tags: clarify documentation
418
366 - The explanation for "fetch --tags" was actually talking more about
367 - "fetch --no-tags". Clariify what "--tags" really means.
419 + "git fetch --tags" was explained as if it were "git fetch
420 + --no-no-tags", which is not the case, causing confusion.
421 +
422 + May want to fast-track to the upcoming release.
423
424
425 * jk/avoid-mailto-invalid-in-doc (2012-12-16) 1 commit
371 - - Documentation: don't link to example mail addresses
426 + (merged to 'next' on 2012-12-18 at 81dac40)
427 + + Documentation: don't link to example mail addresses
428
429 Avoids invalid sample e-mail addresses from becoming mailto links
374 - in the formatted output, which by itself is "Meh" for me (who
375 - cares?) but it highlights some issues with ``pretty quotes''.
430 + in the formatted output.
431
377 - Will merge to 'next'.
432 + May want to fast-track to the upcoming release.
433
434
435 * jk/complete-commit-c (2012-12-15) 1 commit
381 - - completion: complete refs for "git commit -c"
436 + (merged to 'next' on 2012-12-18 at 75b5f21)
437 + + completion: complete refs for "git commit -c"
438
439 Complete "git commmit -c foo<TAB>" into a refname that begins with
440 "foo".
441
386 - Will merge to 'next'.
387 -
442
443 * jk/error-const-return (2012-12-15) 2 commits
444 - silence some -Wuninitialized false positives
@@ -392,18 +446,21 @@ repositories listed at
446
447 Help compilers' flow analysis by making it more explicit that
448 error() always returns -1, to reduce false "variable used
395 - uninitialized" warnings.
449 + uninitialized" warnings. Looks somewhat ugly but not too much.
450
397 - This is still an RFC.
451 + Will merge to 'next'.
452
453
400 -* mk/qnx (2012-12-15) 2 commits
454 +* mk/qnx (2012-12-19) 2 commits
455 - Port to QNX
456 - Make lock local to fetch_pack
457 + (this branch uses dm/port.)
458
459 Port to QNX; we may want to rebase this on top of dm/port topic as
460 it also wants to use the HAVE_STRINGS_H mechanism it introduces.
461
462 + Will merge to 'next'.
463 +
464
465 * rj/maint-cygwin-say-color (2012-12-15) 1 commit
466 - tests: Allow customization of how say_color() prints
@@ -414,19 +471,21 @@ repositories listed at
471
472
473 * sl/readme-gplv2 (2012-12-15) 2 commits
417 - - README: it does not matter who the current maintainer is
418 - - README: Git is released under the GPLv2, not just "the GPL"
474 + (merged to 'next' on 2012-12-18 at c839810)
475 + + README: it does not matter who the current maintainer is
476 + + README: Git is released under the GPLv2, not just "the GPL"
477
478 Clarify that the project as a whole is GPLv2 only, with some parts
479 borrowed under different licenses that are compatible with GPLv2.
480
423 - Will merge to 'next'.
481 + May want to fast-track to the upcoming release.
482
483
484 * ta/api-index-doc (2012-12-16) 1 commit
427 - - Remove misleading date from api-index-skel.txt
485 + (merged to 'next' on 2012-12-18 at a251888)
486 + + Remove misleading date from api-index-skel.txt
487
429 - Will merge to 'next'.
488 + May want to fast-track to the upcoming release.
489
490
491 * as/test-tweaks (2012-12-17) 7 commits
@@ -499,14 +558,6 @@ repositories listed at
558 Will cook in 'next'.
559
560
502 -* wk/submodule-update-remote (2012-12-12) 3 commits
503 - - submodule add: If --branch is given, record it in .gitmodules
504 - - submodule update: add --remote for submodule's upstream changes
505 - - submodule: add get_submodule_config helper funtion
506 -
507 - Expecting a re-roll.
508 -
509 -
561 * jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit
562 (merged to 'next' on 2012-12-11 at 6659fdc)
563 + sh-setup: work around "unset IFS" bug in some shells
@@ -523,16 +574,15 @@ repositories listed at
574
575
576 * nd/invalidate-i-t-a-cache-tree (2012-12-15) 4 commits
526 - - cache-tree: invalidate i-t-a paths after generating trees
527 - - cache-tree: fix writing cache-tree when CE_REMOVE is present
528 - - cache-tree: replace "for" loops in update_one with "while" loops
529 - - cache-tree: remove dead i-t-a code in verify_cache()
577 + (merged to 'next' on 2012-12-18 at 33e4488)
578 + + cache-tree: invalidate i-t-a paths after generating trees
579 + + cache-tree: fix writing cache-tree when CE_REMOVE is present
580 + + cache-tree: replace "for" loops in update_one with "while" loops
581 + + cache-tree: remove dead i-t-a code in verify_cache()
582
583 Writing out a tree object when you still have intent-to-add entries
584 in the index left an incorrect cache-tree data there.
585
534 - Will merge to 'next'.
535 -
586
587 * jl/submodule-deinit (2012-12-04) 1 commit
588 (merged to 'next' on 2012-12-07 at ea772f0)
@@ -552,7 +602,7 @@ repositories listed at
602 + git-svn: Recommend use of structure options.
603 + git-svn: Document branches with at-sign(@).
604
555 - Will cook in 'next'.
605 + May want to fast-track to the upcoming release.
606
607
608 * pf/editor-ignore-sigint (2012-12-02) 5 commits