Re: What's cooking in git.git (May 2014, #01; Tue, 6)
Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Plus this one which has been completely ignored: completion: move out of contrib It is not about ignored. It is about running out of time before concluding the day's integration. A comment doesn't require integration. It requires time and attention that are limited commodities. Moreover, I won't read or respond to pieces of e-mail in the order they come in. The topics listed in the What's cooking report is fixed at the end of the day's integration cycle, as they are essentially output of log --first-parent master..pu | grep Merge. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
What's cooking in git.git (May 2014, #01; Tue, 6)
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The tip of the 'master' branch has passed v2.0.0-rc1. Last minute fixes to newly added code keep flowing in, which is good. I've picked up some topics that will not be part of the upcoming release to 'pu' not to lose them, but I didn't have time to give them a deep reading. You can find the changes described here in the integration branches of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -- [Graduated to master] * km/git-svn-workaround-older-getopt-long (2014-04-23) 1 commit (merged to 'next' on 2014-04-23 at 3f35586) + t9117: use --prefix instead of --prefix= Finishing touches to a change that is already in 'master'. * mk/doc-git-gui-display-untracked (2014-04-21) 1 commit (merged to 'next' on 2014-04-22 at 385d39a) + Documentation: git-gui: describe gui.displayuntracked * mw/symlinks (2014-04-24) 1 commit (merged to 'next' on 2014-04-25 at 20b2af6) + setup: fix windows path buffer over-stepping A finishing touch fix to a new change already in 'master'. * rh/prompt-pcmode-avoid-eval-on-refname (2014-04-22) 1 commit (merged to 'next' on 2014-04-22 at 3a1506f) + git-prompt.sh: don't put unsanitized branch names in $PS1 -- [New Topics] * bg/strbuf-trim (2014-04-30) 2 commits - api-strbuf.txt: Add docs for _trim and _ltrim - strbuf: Use _rtrim and _ltrim in strbuf_trim Will merge to 'next'. * cb/byte-order (2014-05-02) 2 commits - compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN - compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER Will merge to 'next'. * dt/api-doc-setup-gently (2014-04-30) 1 commit - docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP Will merge to 'next'. * dt/merge-recursive-case-insensitive (2014-05-06) 1 commit - merge-recursive.c: Fix case-changing merge bug * ew/config-protect-mode (2014-05-06) 1 commit - config: preserve config file permissions on edits Will merge to 'next'. * fc/rerere-conflict-style (2014-04-30) 1 commit - rerere: fix for merge.conflictstyle Will merge to 'next'. * jc/coding-guidelines (2014-05-02) 8 commits - CodingGuidelines: on splitting a long line - CodingGuidelines: on comparison - CodingGuidelines: do not call the conditional statement if() - CodingGuidelines: give an example for shell function preamble - CodingGuidelines: give an example for control statements - CodingGuidelines: give an example for redirection - CodingGuidelines: give an example for case/esac statement - CodingGuidelines: once it is in, it is not worth the code churn Needs to be rerolled. * jd/subtree (2014-05-06) 5 commits - contrib/subtree/Makefile: clean rule cleanup - contrib/subtree/Makefile: Doc-gen rules cleanup - contrib/subtree/Makefile: s/libexecdir/gitexecdir - contrib/subtree/Makefile: Use GIT-VERSION-FILE - contrib/subtree/Makefile: scrap unused $(gitdir) Will merge to 'next'. * jk/commit-date-approxidate (2014-05-02) 4 commits - commit: accept more date formats for --date - commit: print Date line when the user has set date - pretty: make show_ident_date public - commit: use split_ident_line to compare author/committer Will merge to 'next'. * mm/pager-less-sans-S (2014-04-30) 1 commit - pager: remove 'S' from $LESS by default Will merge to 'next'. * sk/msvc-dynlink-crt (2014-05-06) 1 commit - MSVC: link dynamically to the CRT Will merge to 'next'. -- [Stalled] * tr/merge-recursive-index-only (2014-02-05) 3 commits - merge-recursive: -Xindex-only to leave worktree unchanged - merge-recursive: internal flag to avoid touching the worktree - merge-recursive: remove dead conditional in update_stages() (this branch is used by tr/remerge-diff.) Will hold. * tr/remerge-diff (2014-02-26) 5 commits . log --remerge-diff: show what the conflict resolution changed . name-hash: allow dir hashing even when !ignore_case . merge-recursive: allow storing conflict hunks in index . revision: fold all merge diff variants into an enum merge_diff_mode . combine-diff: do not pass revs-dense_combined_merges redundantly (this branch uses tr/merge-recursive-index-only.) log -p output learns a new way to let users inspect a merge commit by showing the differences between the automerged result with conflicts the person who recorded the merge would have seen and the final conflict resolution that was recorded in the merge. Needs to be rebased, now kb/fast-hashmap topic is in. * jk/makefile (2014-02-05) 16 commits - FIXUP - move LESS/LV pager environment to Makefile - Makefile: teach scripts to include make variables - FIXUP - Makefile: auto-build C strings from make variables - Makefile: drop
RE: What's cooking in git.git (May 2014, #01; Tue, 6)
Junio C Hamano wrote:
* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
- remote-hg: trivial cleanups
- remote-hg: make sure we omit multiple heads
- git-remote-hg: use internal clone's hgrc
- t: remote-hg: split into setup test
- remote-hg: properly detect missing contexts
- remote-{hg,bzr}: store marks only on success
- remote-hg: update to 'public' phase when pushing
- remote-hg: fix parsing of custom committer
(merged to 'next' on 2014-04-22 at fed170a)
+ remote-helpers: move tests out of contrib
+ remote-helpers: move out of contrib
+ remote-helpers: squelch python import exceptions
Move remote-hg and remote-bzr out of contrib/. There were some
suggestions on the follow-up fix patches still not in 'next', which
may result in a reroll.
I've no idea what suggestions you are talking about.
I tend to agree with John Keeping that remote helpers that are
actively maintained can and should aim to graduate from my tree and
given to the user directly.
Wait, I was under the impression the graduation was going to happen for
v2.0.
I don't understand what is the point of preparing the v2.0 for so long,
and then all of a sudden tag v2.0.0-rc0 and say oops! if you wanted to
get something into v2.0 it's too late now, wait another 2-10 years for
important changes to get merged.
Such a wasted opportunity and such a disappointing release.
Therefore the release notes are still lying to the users:
* git push via transport-helper interface (e.g. remote-hg) has
been updated to allow ref deletion in a way similar to the natively
supported transports.
That is not true.
These should obviously be part of the v2.0:
* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
+ remote-helpers: move tests out of contrib
+ remote-helpers: move out of contrib
+ remote-helpers: squelch python import exceptions
- remote-{hg,bzr}: store marks only on success
* fc/remote-helper-refmap (2014-04-21) 8 commits
(merged to 'next' on 2014-04-22 at fb5a4c2)
+ transport-helper: remove unnecessary strbuf resets
+ transport-helper: add support to delete branches
+ fast-export: add support to delete refs
+ fast-import: add support to delete refs
+ transport-helper: add support to push symbolic refs
+ transport-helper: add support for old:new refspec
+ fast-export: add new --refspec option
+ fast-export: improve argument parsing
* fc/merge-default-to-upstream (2014-04-22) 1 commit
+ merge: enable defaulttoupstream by default
* fc/mergetool-prompt (2014-04-24) 2 commits
+ mergetool: document the default for --[no-]prompt
+ mergetool: run prompt only if guessed tool
Plus this one which has been completely ignored:
completion: move out of contrib
Since you are not going to do so, I do not feel compelled to fix the
synchronization crash regression that is present in v2.0.0-rc2 and I
already warned you about.
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (May 2014, #01; Tue, 6)
Felipe Contreras felipe.contre...@gmail.com writes: Therefore the release notes are still lying to the users: * git push via transport-helper interface (e.g. remote-hg) has been updated to allow ref deletion in a way similar to the natively supported transports. That is not true. Hmph, you are right. I somehow mislabeled the series that ends at a7cb1276cc263446b19b43d3a7784cbc72f84e28 dealing with delete, when the series actually is about forcing. Will update. Plus this one which has been completely ignored: completion: move out of contrib It is not about ignored. It is about running out of time before concluding the day's integration. I can hopefully queue it on 'pu' tomorrow, and depending on the reviews or lack of reviews, it may advance on its own pace from there. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (May 2014, #01; Tue, 6)
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Plus this one which has been completely ignored: completion: move out of contrib It is not about ignored. It is about running out of time before concluding the day's integration. A comment doesn't require integration. Either way the rest of the patches have already advanced. -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
