To: git@vger.kernel.org
-Cc: Eric Wong <normalperson@yhbt.net>,
- Pete Wyckoff <pw@padd.com>,
- Luke Diamand <luke@diamand.org>,
- Erik Faye-Lund <kusmabite@gmail.com>,
- Stefan Zager <szager@google.com>
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Aug 2012, #06; Sun, 19)
+Subject: What's cooking in git.git (Aug 2012, #06; Tue, 21)
X-master-at: 889d35899ba64640e47798681ecb34a4be043bad
-X-next-at: d66298809de5c57cf7578f0abaa9088f2784c3c9
+X-next-at: 332afe444c0ae4d1fa700e16c4e23b42960792b4
-What's cooking in git.git (Aug 2012, #06; Sun, 19)
+What's cooking in git.git (Aug 2012, #06; Tue, 21)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
-Now 1.7.12 is out, we will have a few days of calming down period on
-the 'master' front, just in case we have to deal with brown paper
-bag post-release fixes, and then start getting the topics that have
-been cooking on the 'next' branch graduate to the 'master', perhaps
-starting on coming Wednesday.
-
-For this cycle, we already have fairly well cooked topics, many of
-which are on 'next', and the git-svn updates for svn 1.7 by Michael
-G Schwern is also a candidate for early graduation, provided if Eric
-is OK with the series (I'd need to double check with him). There
-also were some topics that were almost there already during their
-review discussions but somehow lost momentum when we got distracted,
-and I think most of them would be ready fairly quickly if the
-respective owners of the topics (you know who you are) can find time
-to put some work into them.
-
-So I'm planning to keep this cycle reasonably short and aim for
-tagging the result as 1.8.0 at the end of 9th week, on October 21st,
-after which I'd disappear for a few weeks.
-http://tinyurl.com/gitCal is where you can always find my rough
-tagging schedule at.
+I'm planning to keep this cycle reasonably short and aim for tagging
+the result as 1.8.0 at the end of 9th week, on October 21st, after
+which I'd disappear for a few weeks. http://tinyurl.com/gitCal is
+where you can always find my rough tagging schedule at.
You can find the changes described here in the integration branches of the
repositories listed at
--------------------------------------------------
[New Topics]
-* kk/maint-for-each-ref-multi-sort (2012-08-19) 2 commits
+* kk/maint-for-each-ref-multi-sort (2012-08-21) 2 commits
- for-each-ref: Fix sort with multiple keys
- t6300: test sort with multiple keys
touch too many unrelated existing ones needlessly, which may want to
be fixed by a reroll.
+* nd/i18n-parseopt-help (2012-08-20) 54 commits
+ - i18n: shortlog: mark parseopt strings for translation
+ - i18n: rm: mark parseopt strings for translation
+ - i18n: revert, cherry-pick: mark parseopt strings for translation
+ - i18n: rev-parse: mark parseopt strings for translation
+ - i18n: reset: mark parseopt strings for translation
+ - i18n: rerere: mark parseopt strings for translation
+ - i18n: status: mark parseopt strings for translation
+ - i18n: replace: mark parseopt strings for translation
+ - i18n: remote: mark parseopt strings for translation
+ - i18n: read-tree: mark parseopt strings for translation
+ - i18n: push: mark parseopt strings for translation
+ - i18n: prune: mark parseopt strings for translation
+ - i18n: prune-packed: mark parseopt strings for translation
+ - i18n: pack-refs: mark parseopt strings for translation
+ - i18n: pack-objects: mark parseopt strings for translation
+ - i18n: notes: mark parseopt strings for translation
+ - i18n: name-rev: mark parseopt strings for translation
+ - i18n: mv: mark parseopt strings for translation
+ - i18n: mktree: mark parseopt strings for translation
+ - i18n: merge: mark parseopt strings for translation
+ - i18n: merge-file: mark parseopt strings for translation
+ - i18n: merge-base: mark parseopt strings for translation
+ - i18n: ls-tree: mark parseopt strings for translation
+ - i18n: ls-files: mark parseopt strings for translation
+ - i18n: log: mark parseopt strings for translation
+ - i18n: init-db: mark parseopt strings for translation
+ - i18n: help: mark parseopt strings for translation
+ - i18n: hash-object: mark parseopt strings for translation
+ - i18n: grep: mark parseopt strings for translation
+ - i18n: gc: mark parseopt strings for translation
+ - i18n: fsck: mark parseopt strings for translation
+ - i18n: format-patch: mark parseopt strings for translation
+ - i18n: for-each-ref: mark parseopt strings for translation
+ - i18n: fmt-merge-msg: mark parseopt strings for translation
+ - i18n: fetch: mark parseopt strings for translation
+ - i18n: fast-export: mark parseopt strings for translation
+ - i18n: describe: mark parseopt strings for translation
+ - i18n: config: mark parseopt strings for translation
+ - i18n: count-objects: mark parseopt strings for translation
+ - i18n: commit: mark parseopt strings for translation
+ - i18n: column: mark parseopt strings for translation
+ - i18n: clone: mark parseopt strings for translation
+ - i18n: clean: mark parseopt strings for translation
+ - i18n: cherry: mark parseopt strings for translation
+ - i18n: checkout: mark parseopt strings for translation
+ - i18n: checkout-index: mark parseopt strings for translation
+ - i18n: check-attr: mark parseopt strings for translation
+ - i18n: cat-file: mark parseopt strings for translation
+ - i18n: branch: mark parseopt strings for translation
+ - i18n: blame: mark parseopt strings for translation
+ - i18n: add: mark parseopt strings for translation
+ - i18n: bisect--helper: mark parseopt strings for translation
+ - i18n: archive: mark parseopt strings for translation
+ - i18n: mark "style" in OPT_COLUMN() for translation
+
+A lot of i18n mark-up for the help text from "git <cmd> -h".
+
+* tr/maint-parseopt-avoid-empty (2012-08-20) 1 commit
+ - gettext: do not translate empty string
+
+A workaround to avoid doing _(""), which translates to magic string
+in the .po files.
+
+* jk/config-warn-on-inaccessible-paths (2012-08-21) 4 commits
+ - warn_on_inaccessible(): a helper to warn on inaccessible paths
+ - attr: warn on inaccessible attribute files
+ - gitignore: report access errors of exclude files
+ - config: warn on inaccessible files
+
+When looking for $HOME/.gitconfig etc., it is OK if we cannot read
+them because they do not exist, but unable to read existing ones
+need to be diagnosed.
+
+* nd/i18n-poison-test-updates (2012-08-21) 6 commits
+ - Fix tests under GETTEXT_POISON on parseopt
+ - Fix tests under GETTEXT_POISON on pack-object
+ - Fix tests under GETTEXT_POISON on git-apply
+ - Fix tests under GETTEXT_POISON on diffstat
+ - Fix tests under GETTEXT_POISON on git-stash
+ - Fix tests under GETTEXT_POISON on relative dates
+
+Updates to tests that can be broken with gettext-poison builds.
+
--------------------------------------------------
[Stalled]
+* pw/p4-submit-conflicts (2012-08-16) 12 commits
+ - git p4: add submit --prepare-p4-only option
+ - git p4: add submit --dry-run option
+ - git p4: accept -v for --verbose
+ - git p4: revert deleted files after submit cancel
+ - git p4: rearrange submit template construction
+ - git p4: test clean-up after failed submit, fix added files
+ - git p4: standardize submit cancel due to unchanged template
+ - git p4: move conflict prompt into run, use [c]ontinue and [q]uit
+ - git p4: remove submit failure options [a]pply and [w]rite
+ - git p4: gracefully fail if some commits could not be applied
+ - git p4 test: use p4d -L option to suppress log messages
+ - git p4 test: remove bash-ism of combined export/assignment
+
+Waiting for the dust to settle.
+
* mz/rebase-range (2012-07-18) 7 commits
. rebase (without -p): correctly calculate patches to rebase
. rebase -p: don't request --left-right only to ignore left side
[Cooking]
* hv/coding-guidelines (2012-08-15) 1 commit
- (merged to 'next' on 2012-08-18 at 5a78f2c)
+ (merged to 'next' on 2012-08-20 at 4984865)
+ Documentation/CodingGuidelines: spell out more shell guidelines
+(Originally merged to 'next' on 2012-08-18)
+
In earlier days, "imitate the style in the neibouring code" was
sufficient to keep the coherent style, but over time some parts of
the codebase have drifted enough to make it ineffective.
Will merge to 'master' as part of the first batch.
* jc/daemon-access-hook (2012-08-15) 1 commit
- - daemon: --access-hook option
+ (merged to 'next' on 2012-08-20 at c8f5b2e)
+ + daemon: --access-hook option
Allow an external command to tell git-daemon to decline service
based on the client address, repository path, etc.
-Will merge to 'next'.
-
* jc/send-email-reconfirm (2012-08-14) 1 commit
- - send-email: validate & reconfirm interactive responses
+ (merged to 'next' on 2012-08-20 at dffdef6)
+ + send-email: validate & reconfirm interactive responses
Validate interactive input to "git send-email" to avoid common
mistakes such as saying "y<RETURN>" to sender mail address whose
prompt is given with a correctly guessed default.
-Will merge to 'next'.
-
-* pw/p4-submit-conflicts (2012-08-16) 12 commits
- - git p4: add submit --prepare-p4-only option
- - git p4: add submit --dry-run option
- - git p4: accept -v for --verbose
- - git p4: revert deleted files after submit cancel
- - git p4: rearrange submit template construction
- - git p4: test clean-up after failed submit, fix added files
- - git p4: standardize submit cancel due to unchanged template
- - git p4: move conflict prompt into run, use [c]ontinue and [q]uit
- - git p4: remove submit failure options [a]pply and [w]rite
- - git p4: gracefully fail if some commits could not be applied
- - git p4 test: use p4d -L option to suppress log messages
- - git p4 test: remove bash-ism of combined export/assignment
-
-I saw Pete and Luke going back and forth collaborating, so I take
-that this may still be rerolled---if not, please holler.
-
* tx/relative-in-the-future (2012-08-16) 2 commits
- date: show relative dates in the future
- date: refactor the relative date logic from presentation
somewhat more maintainable form, though it breaks existing i18n.
* ef/win32-cred-helper (2012-08-16) 1 commit
- - contrib: add win32 credential-helper
-
-Credential helper for Win32 (is this GUI???).
+ (merged to 'next' on 2012-08-20 at bd5c651)
+ + contrib: add win32 credential-helper
-Will merge to 'next'.
+Credential helper for Win32 to allow access to the keychain of
+the logged-in user.
* jc/maint-abbrev-option-cli (2012-08-16) 1 commit
- (merged to 'next' on 2012-08-18 at e002006)
+ (merged to 'next' on 2012-08-20 at 54d1a5a)
+ gitcli: describe abbreviation of long options
+(Originally merged to 'next' on 2012-08-18)
+
We did not document that many commands take unique prefix
abbreviations of long options (e.g. "--option" may be the only flag
that the command accepts that begin with "--opt", in which case you
Will merge to 'master' as part of the first batch.
* mv/pull-r-for-rebase (2012-08-17) 1 commit
- (merged to 'next' on 2012-08-18 at e7d885b)
+ (merged to 'next' on 2012-08-20 at 9743071)
+ man: git pull -r is a short for --rebase
-Minor documentation update.
+(Originally merged to 'next' on 2012-08-18)
+
+A minor documentation update.
Will merge to 'master' as part of the first batch.
-* rr/precompose-utf8-cleanup (2012-08-17) 1 commit
- - cleanup precompose_utf8
+* rr/precompose-utf8-cleanup (2012-08-20) 2 commits
+ (merged to 'next' on 2012-08-20 at a883c2a)
+ + precompose-utf8: do not call checks for non-ascii "utf8"
+ + cleanup precompose_utf8
A style and code cleanup.
-Will merge to 'next'.
* jc/doc-git-updates (2012-08-17) 1 commit
- (merged to 'next' on 2012-08-18 at f24913b)
+ (merged to 'next' on 2012-08-20 at ab1db71)
+ Documentation: update the introductory section
+(Originally merged to 'next' on 2012-08-18)
+
Will merge to 'master' as part of the first batch.
-* fa/remote-svn (2012-08-17) 16 commits
+* fa/remote-svn (2012-08-20) 16 commits
- Add a test script for remote-svn
- remote-svn: add marks-file regeneration
- Add a svnrdump-simulator replaying a dump file for testing
- Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
- Add argv_array_detach and argv_array_free_detached
- Add svndump_init_fd to allow reading dumps from arbitrary FDs
- - Integrate remote-svn into svn-fe/Makefile
+ - Add git-remote-testsvn to Makefile
- Implement a remote helper for svn in C
(this branch is used by fa/vcs-svn.)
-* fa/vcs-svn (2012-08-18) 7 commits
- - fixup: add missing cast to vcs-svn/fast_export.c
- - fixup - no old style defn
+* fa/vcs-svn (2012-08-20) 4 commits
- vcs-svn: remove repo_tree
- vcs-svn/svndump: rewrite handle_node(), begin|end_revision()
- vcs-svn/svndump: restructure node_ctx, rev_ctx handling
- svndump: move struct definitions to .h
- - vcs-svn: Add sha1 calculation to fast_export and line_buffer
(this branch uses fa/remote-svn.)
-I haven't seen many comments and reviews from people involved in the
-area, other than DBarr's worries on teaching exporter (which is
-supposed to be Git agnostic, as its output "fast-import" format is
-meant to be usable by others) to compute object names in Git way.
-
-It is somewhat hard for me to judge these two series.
+Rerolled with another round of fix-up squashed in.
* mh/maint-config-doc-proxy-command (2012-08-18) 2 commits
- - git-config doc: unconfuse an example
- - git-config.txt: fix example
+ (merged to 'next' on 2012-08-20 at a484625)
+ + git-config doc: unconfuse an example
+ + git-config.txt: fix example
-Will merge to 'next'.
+A minor documentation update.
* ph/stash-rerere (2012-08-17) 2 commits
- - stash: invoke rerere in case of conflict
- - test: git-stash conflict sets up rerere
+ (merged to 'next' on 2012-08-20 at ae37111)
+ + stash: invoke rerere in case of conflict
+ + test: git-stash conflict sets up rerere
"git stash" internally used "git merge-recursive" backend, which did
not trigger "rerere" upon conflicts unlike other mergy operations.
-Will merge to 'next'.
-
* hv/submodule-path-unmatch (2012-08-14) 1 commit
- - Let submodule command exit with error status if path does not exist
+ (merged to 'next' on 2012-08-20 at cbe6483)
+ + Let submodule command exit with error status if path does not exist
As the title says.
-Will merge to 'next'.
* jc/add-delete-default (2012-08-13) 1 commit
- git add: notice removal of tracked paths by default
to do in the longer term; waiting for comments.
* jc/maint-rev-list-topo-doc (2012-08-15) 1 commit
- (merged to 'next' on 2012-08-18 at d1f54d9)
+ (merged to 'next' on 2012-08-20 at 0f669d2)
+ rev-list docs: clarify --topo-order description
+(Originally merged to 'next' on 2012-08-18)
+
It was unclear what "--topo-order" was really about in the
documentation. It is not just about "children before parent", but
also about "don't mix lineages".
Will merge to 'master' as part of the first batch.
* bc/receive-pack-stdout-protection (2012-08-06) 2 commits
- (merged to 'next' on 2012-08-07 at d7aa316)
+ (merged to 'next' on 2012-08-20 at b1b0d18)
+ receive-pack: do not leak output from auto-gc to standard output
+ t/t5400: demonstrate breakage caused by informational message from prune
+(Originally merged to 'next' on 2012-08-07)
+
When "git push" triggered the automatic gc on the receiving end, a
message from "git prune" that said it was removing cruft leaked to
the standard output, breaking the communication protocol.
Will merge to 'master' as part of the second batch.
* bc/prune-info (2012-08-07) 1 commit
- - prune.c: only print informational message in show_only or verbose mode
+ (merged to 'next' on 2012-08-20 at 1bc9e66)
+ + prune.c: only print informational message in show_only or verbose mode
Teach "git prune" without "-v" to be silent about leftover temporary files.
-Will merge to 'next'.
-
* jc/tag-doc (2012-08-06) 1 commit
- (merged to 'next' on 2012-08-18 at 9fe64b2)
+ (merged to 'next' on 2012-08-20 at 9eb658e)
+ Documentation: do not mention .git/refs/* directories
+(Originally merged to 'next' on 2012-08-18)
+
Our documentation used to assume having files in .git/refs/*
directories was the only to have branches and tags, but that is not
true for quite some time.
Will merge to 'master' as part of the first batch.
* jk/docs-docbook-monospace-display (2012-08-07) 1 commit
- (merged to 'next' on 2012-08-18 at 7e02bf8)
+ (merged to 'next' on 2012-08-20 at 0ed30dc)
+ docs: monospace listings in docbook output
+(Originally merged to 'next' on 2012-08-18)
+
The documentation in the TeXinfo format was using indented output
for materials meant to be examples that are better typeset in
monospace.
Will merge to 'master' as part of the second batch.
* jc/maint-protect-sh-from-ifs (2012-08-08) 1 commit
- - sh-setup: protect from exported IFS
+ (merged to 'next' on 2012-08-20 at 8b00562)
+ + sh-setup: protect from exported IFS
When the user exports a non-default IFS without HT, scripts that
rely on being able to parse "ls-files -s | while read a b c..."
start to fail. Protect them from such a misconfiguration.
-Will merge to 'next'.
-
* jk/check-docs-update (2012-08-08) 8 commits
- (merged to 'next' on 2012-08-18 at 4409d2e)
+ (merged to 'next' on 2012-08-20 at d51021d)
+ check-docs: get documented command list from Makefile
+ check-docs: drop git-help special-case
+ check-docs: list git-gui as a command
+ check-docs: update non-command documentation list
+ check-docs: mention gitweb specially
+(Originally merged to 'next' on 2012-08-18)
+
Simplify "make check-docs" implementation and update its coverage.
Will merge to 'master' as part of the first batch.
* js/gitweb-path-info-unquote (2012-08-15) 1 commit
- (merged to 'next' on 2012-08-15 at 844da17)
+ (merged to 'next' on 2012-08-20 at a4aa740)
+ gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
+(Originally merged to 'next' on 2012-08-15)
+
Stripping of PATH_INFO in gitweb did not take url style quoting into
account, failing to notice directories with funny characters e.g. SP
in their paths.
Will merge to 'master' as part of the first batch.
* mg/rebase-i-onto-reflog-in-full (2012-08-10) 1 commit
- - rebase -i: use full onto sha1 in reflog
+ (merged to 'next' on 2012-08-20 at f671bd2)
+ + rebase -i: use full onto sha1 in reflog
The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent.
-Will merge to 'next'.
-
* mz/empty-rebase-test (2012-08-09) 1 commit
- - add tests for 'git rebase --keep-empty'
-
-Will merge to 'next'.
+ (merged to 'next' on 2012-08-20 at 53e2419)
+ + add tests for 'git rebase --keep-empty'
* jc/capabilities (2012-08-13) 3 commits
- - fetch-pack: mention server version with verbose output
- - parse_feature_request: make it easier to see feature values
- - fetch-pack: do not ask for unadvertised capabilities
+ (merged to 'next' on 2012-08-20 at 1976e47)
+ + fetch-pack: mention server version with verbose output
+ + parse_feature_request: make it easier to see feature values
+ + fetch-pack: do not ask for unadvertised capabilities
(this branch uses jk/version-string.)
Some capabilities were asked by fetch-pack even when upload-pack did
not advertise that they are available. Fix fetch-pack not to do so.
-Will merge to 'next'.
-
-* pw/p4-use-client-spec-branch-detection (2012-08-11) 5 commits
+* pw/p4-use-client-spec-branch-detection (2012-08-20) 5 commits
- git p4: make branch detection work with --use-client-spec
- git p4: do wildcard decoding in stripRepoPath
- git p4: set self.branchPrefixes in initialization
Need to send it out to the list for review.
* jk/version-string (2012-08-10) 3 commits
- (merged to 'next' on 2012-08-10 at d8dcb00)
+ (merged to 'next' on 2012-08-20 at 6d207bb)
+ do not send client agent unless server does first
+ send-pack: fix capability-sending logic
- (merged to 'next' on 2012-08-09 at 64dc91b)
+ include agent identifier in capability string
(this branch is used by jc/capabilities.)
+(Originally merged to 'next' on 2012-08-10)
+
Leftover bits from the "git version" code restructuring, that give
us an ability to expose the Git version over the wire in the
protocol exchange. But we do so carefully only to the other end that
Will merge to 'master' as part of the third batch.
* js/grep-patterntype-config (2012-08-03) 1 commit
- (merged to 'next' on 2012-08-09 at 1a08d6c)
+ (merged to 'next' on 2012-08-20 at 39a0431)
+ grep: add a grep.patternType configuration setting
+(Originally merged to 'next' on 2012-08-09)
+
"grep" learned to use a non-standard pattern type by default if a
configuration variable tells it to.
Will merge to 'master' as part of the second batch.
* mm/die-with-dashdash-help (2012-08-03) 1 commit
- (merged to 'next' on 2012-08-09 at 1aae096)
+ (merged to 'next' on 2012-08-20 at ebe0e1a)
+ setup: clarify error messages for file/revisions ambiguity
+(Originally merged to 'next' on 2012-08-09)
+
Reword error messages.
Will merge to 'master' as part of the first batch.
* tr/merge-recursive-flush (2012-08-03) 1 commit
- (merged to 'next' on 2012-08-09 at da826ec)
+ (merged to 'next' on 2012-08-20 at 00aeb19)
+ merge-recursive: eliminate flush_buffer() in favor of write_in_full()
+(Originally merged to 'next' on 2012-08-09)
+
Remove unnecessary code.
Will merge to 'master' as part of the first batch.
* tr/void-diff-setup-done (2012-08-03) 1 commit
- (merged to 'next' on 2012-08-09 at 668a46f)
+ (merged to 'next' on 2012-08-20 at 2f21f63)
+ diff_setup_done(): return void
+(Originally merged to 'next' on 2012-08-09)
+
Remove unnecessary code.
Will merge to 'master' as part of the first batch.
* mk/test-seq (2012-08-04) 1 commit
- (merged to 'next' on 2012-08-06 at 3f6917c)
+ (merged to 'next' on 2012-08-20 at c373e0e)
+ tests: Introduce test_seq
(this branch is used by ab/diff-write-incomplete-line.)
+(Originally merged to 'next' on 2012-08-06)
+
Add a compatibility/utility function to the test framework.
Will merge to 'master' as part of the first batch.
* ab/diff-write-incomplete-line (2012-08-05) 1 commit
- (merged to 'next' on 2012-08-07 at dcf02ae)
+ (merged to 'next' on 2012-08-20 at e28b804)
+ Fix '\ No newline...' annotation in rewrite diffs
(this branch uses mk/test-seq.)
+(Originally merged to 'next' on 2012-08-07)
+
The output from "git diff -B" for a file that ends with an
incomplete line did not put "\ No newline..." on a line of its own.
Will merge to 'master' as part of the second batch.
* pg/maint-apply-remove-unused-variable (2012-08-05) 1 commit
- (merged to 'next' on 2012-08-05 at aa9f5e9)
+ (merged to 'next' on 2012-08-20 at 260975b)
+ apply: delete unused deflate_origlen from patch struct
-Remove unused field.
+(Originally merged to 'next' on 2012-08-05)
+
+Remove an unused field.
Will merge to 'master' as part of the first batch.
* tg/index-v5 (2012-08-17) 13 commits
access to the state of the last posted version.
* nd/index-errno (2012-08-06) 1 commit
- (merged to 'next' on 2012-08-06 at a9f2101)
+ (merged to 'next' on 2012-08-20 at 34076c6)
+ read_index_from: remove bogus errno assignments
+(Originally merged to 'next' on 2012-08-06)
+
Assignments to errno before calling system functions that used to
matter in the old code were left behind after the code structure
changed sufficiently to make them useless.
Will merge to 'master' as part of the first batch.
* jc/maint-sane-execvp-notdir (2012-07-31) 1 commit
- (merged to 'next' on 2012-08-09 at 5dd4240)
+ (merged to 'next' on 2012-08-20 at 0d76cf2)
+ sane_execvp(): ignore non-directory on $PATH
+(Originally merged to 'next' on 2012-08-09)
+
"git foo" errored out with "Not a directory" when the user had a non
directory on $PATH, and worse yet it masked an alias "foo" to run.
Will merge to 'master' as part of the third batch.
-* jc/sanitize-nkd-lazy-iconv-open (2012-07-31) 1 commit
- (merged to 'next' on 2012-08-09 at 832c238)
- + macos: lazily initialize iconv
-
-Teach the code that works around NKD/NKC gotcha on MacOS to call
-iconv_open() only when it is necessary, in the hope of avoiding
-set-up overhead.
-
-Needs some work to rename functions
-as mentioned by Linus in the discussion.
-
* tr/maint-send-email-2047 (2012-07-31) 1 commit
- (merged to 'next' on 2012-08-09 at 17dfe57)
+ (merged to 'next' on 2012-08-20 at cf5ee1c)
+ send-email: improve RFC2047 quote parsing
+(Originally merged to 'next' on 2012-08-09)
+
"git send-email" did not unquote encoded words that appear on the
header correctly, and lost "_" from strings.
Will merge to 'master' as part of the first batch.
* cw/cherry-pick-allow-empty-message (2012-08-06) 1 commit
- (merged to 'next' on 2012-08-09 at eab95f6)
+ (merged to 'next' on 2012-08-20 at 0dc0590)
+ cherry-pick: add --allow-empty-message option
+(Originally merged to 'next' on 2012-08-09)
+
"git cherry-pick" by default stops when it sees a commit without any
log message. The "--allow-empty-message" option can be used to
silently proceed.
Will merge to 'master' as part of the third batch.
* ms/git-svn-1.7 (2012-08-02) 20 commits
- - git-svn: remove ad-hoc canonicalizations
- - git-svn: canonicalize newly-minted URLs
- - git-svn: introduce add_path_to_url function
- - git-svn: canonicalize earlier
- - git-svn: replace URL escapes with canonicalization
- - git-svn: attempt to mimic SVN 1.7 URL canonicalization
- - t9107: fix typo
- - t9118: workaround inconsistency between SVN versions
- - Git::SVN{,::Ra}: canonicalize earlier
- - git-svn: path canonicalization uses SVN API
- - Git::SVN::Utils: remove irrelevant comment
- - git-svn: add join_paths() to safely concatenate paths
- - git-svn: factor out _collapse_dotdot function
- - git-svn: use SVN 1.7 to canonicalize when possible
- - git-svn: move canonicalization to Git::SVN::Utils
- - use Git::SVN{,::RA}->url accessor globally
- - use Git::SVN->path accessor globally
- - Git::SVN::Ra: use accessor for URLs
- - Git::SVN: use accessor for URLs internally
- - Git::SVN: use accessors internally for path
+ (merged to 'next' on 2012-08-21 at ae8aff9)
+ + git-svn: remove ad-hoc canonicalizations
+ + git-svn: canonicalize newly-minted URLs
+ + git-svn: introduce add_path_to_url function
+ + git-svn: canonicalize earlier
+ + git-svn: replace URL escapes with canonicalization
+ + git-svn: attempt to mimic SVN 1.7 URL canonicalization
+ + t9107: fix typo
+ + t9118: workaround inconsistency between SVN versions
+ + Git::SVN{,::Ra}: canonicalize earlier
+ + git-svn: path canonicalization uses SVN API
+ + Git::SVN::Utils: remove irrelevant comment
+ + git-svn: add join_paths() to safely concatenate paths
+ + git-svn: factor out _collapse_dotdot function
+ + git-svn: use SVN 1.7 to canonicalize when possible
+ + git-svn: move canonicalization to Git::SVN::Utils
+ + use Git::SVN{,::RA}->url accessor globally
+ + use Git::SVN->path accessor globally
+ + Git::SVN::Ra: use accessor for URLs
+ + Git::SVN: use accessor for URLs internally
+ + Git::SVN: use accessors internally for path
A series by Michael Schwern via Eric to update git-svn to revamp the
way URLs are internally passed around, to make it work with SVN 1.7.
-Will merge to 'next' after pinging Eric to double check and then to 'master'.
+Will merge to 'master' as part of the first batch.
* jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit
- (merged to 'next' on 2012-07-30 at 9b27acc)
+ (merged to 'next' on 2012-08-20 at 3e2598a)
+ t7406: fix misleading "rev-parse --max-count=1 HEAD"
+(Originally merged to 'next' on 2012-07-30)
+
Test clean-up, with no behaviour change.
Will merge to 'master' as part of the second batch.
name 0{40} recorded in a tree.
* mz/cherry-code-cleanup (2012-07-29) 3 commits
- - cherry: remove redundant check for merge commit
- - cherry: don't set ignored rev_info options
- - remove unnecessary parameter from get_patch_ids()
+ (merged to 'next' on 2012-08-20 at bfb0457)
+ + cherry: remove redundant check for merge commit
+ + cherry: don't set ignored rev_info options
+ + remove unnecessary parameter from get_patch_ids()
Minor code clean-up on the cherry-pick codepath.
-Will merge to 'next'.
-
* jc/maint-config-exit-status (2012-07-30) 1 commit
- (merged to 'next' on 2012-07-30 at 8392da9)
+ (merged to 'next' on 2012-08-20 at e18ddd8)
+ config: "git config baa" should exit with status 1
+(Originally merged to 'next' on 2012-07-30)
+
The exit status code from "git config" was way overspecified while
being incorrect. Update the implementation to give the documented
status for a case that was documented, and introduce a new code for
Will merge to 'master' as part of the third batch.
* jk/maint-null-in-trees (2012-07-29) 2 commits
- (merged to 'next' on 2012-07-30 at 771c497)
+ (merged to 'next' on 2012-08-20 at 5bc2c49)
+ fsck: detect null sha1 in tree entries
+ do not write null sha1s to on-disk index
(this branch uses jk/maint-diff-nul40-as-sentinel.)
+(Originally merged to 'next' on 2012-07-30)
+
We do not want a link to 0{40} object stored anywhere in our objects.
Will merge to 'master' as part of the second batch.
* sz/submodule-force-update (2012-07-25) 1 commit
- (merged to 'next' on 2012-07-26 at 3bda2be)
- + Make 'git submodule update --force' always check out submodules.
+ - Make 'git submodule update --force' always check out submodules.
+
+We may want a documentation update and a few tests.
-We may want a documentation update and a few tests on top.
+Kicked back to 'pu'.
* jc/test-prereq (2012-08-04) 8 commits
- (merged to 'next' on 2012-08-04 at 6dd9156)
+ (merged to 'next' on 2012-08-20 at dd44c4a)
+ fixup! t3910: use the UTF8_NFD_TO_NFC test prereq
- (merged to 'next' on 2012-07-30 at b7c6949)
+ t3910: use the UTF8_NFD_TO_NFC test prereq
- (merged to 'next' on 2012-07-27 at 448cbbc)
+ test-lib: provide UTF8 behaviour as a prerequisite
+ t0050: use the SYMLINKS test prereq
+ t0050: use the CASE_INSENSITIVE_FS test prereq
+ test: allow prerequisite to be evaluated lazily
+ test: rename $satisfied to $satisfied_prereq
+(Originally merged to 'next' on 2012-08-04)
+
Teaches the test framework to probe rarely used prerequistes lazily,
and make use of it for detecting SYMLINKS, CASE_INSENSITIVE_FS and
NKD/NKC MacOS x gotcha.
Will merge to 'master' as part of the first batch.
-* da/difftool-updates (2012-08-10) 12 commits
- (merged to 'next' on 2012-08-10 at 4accbf6)
+* da/difftool-updates (2012-08-21) 13 commits
+ (merged to 'next' on 2012-08-21 at 332afe4)
+ + difftool: silence warning
+ (merged to 'next' on 2012-08-20 at 2fecd90)
+ Add Code Compare v2.80.4 as a merge / diff tool for Windows
+ mergetool,difftool: Document --tool-help consistently
- (merged to 'next' on 2012-07-26 at 3263461)
+ difftool: Disable --symlinks on cygwin
+ difftool: Handle compare() returning -1
+ difftool: Wrap long lines for readability
+ difftool: Check all return codes from compare()
+ difftool: Handle finding mergetools/ in a path with spaces
- (merged to 'next' on 2012-07-23 at 96528a7)
+ difftool: Use symlinks when diffing against the worktree
+ difftool: Call the temp directory "git-difftool"
+ difftool: Move option values into a hash
+ difftool: Eliminate global variables
+ difftool: Simplify print_tool_help()
+(Originally merged to 'next' on 2012-08-10)
+
"git difftool --dir-diff" learned to use symbolic links to prepare
temporary copy of the working tree when available.
Will merge to 'master' as part of the second batch.
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
- (merged to 'next' on 2012-07-23 at fe59cb6)
- + pager: drop "wait for output to run less" hack
+ - pager: drop "wait for output to run less" hack
+
+(Originally merged to 'next' on 2012-07-23)
Will defer until the end of the 2012,
waiting for older "less" to go extinct.
* mm/push-default-switch-warning (2012-06-24) 1 commit
- (merged to 'next' on 2012-06-26 at fea512a)
+ (merged to 'next' on 2012-08-20 at 553e6c0)
+ push: start warning upcoming default change for push.default
+(Originally merged to 'next' on 2012-06-26)
+
+In the next major release, we will switch "git push [$there]" that
+does not say what to push from the traditional "matching" to the
+updated "simple" semantics, that pushes the current branch to the
+branch with the same name only when the current branch is set to
+integrate with that remote branch (all other cases will error out).
+
Will merge to 'master' as part of the second batch.
+
+--------------------------------------------------
+[Discarded]
+
+* jc/sanitize-nkd-lazy-iconv-open (2012-07-31) 1 commit
+ . macos: lazily initialize iconv
+
+Teach the code that works around NKD/NKC gotcha on MacOS to call
+iconv_open() only when it is necessary, in the hope of avoiding
+set-up overhead. It turns out that there was no noticeable
+improvements.
projects / thirdparty / git.git / commitdiff
