Re: What's cooking in git.git (Sep 2013, #03; Wed, 11)
Johannes Sixt j.s...@viscovery.net writes: Am 9/12/2013 17:24, schrieb Junio C Hamano: Johannes Sixt j.s...@viscovery.net writes: Am 9/12/2013 1:32, schrieb Junio C Hamano: * jc/ref-excludes (2013-09-03) 2 commits Thanks for a dose of sanity. I didn't look at rev-parse. I vaguely recall somebody offered follow-ups (was it you?) and at that point I placed this on the back-burner. Yes, I offered to pick up the topic as time permits. Don't hold your breath, though :-) Thanks ;-) -- 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 (Sep 2013, #03; Wed, 11)
Am 9/12/2013 1:32, schrieb Junio C Hamano: * jc/ref-excludes (2013-09-03) 2 commits - document --exclude option - revision: introduce --exclude=glob to tame wildcards People often wished a way to tell git log --branches (and git log --remotes --not --branches) to exclude some local branches from the expansion of --branches (similarly for --tags, --all and --glob=pattern). Now they have one. Will merge to 'next'. Please don't. This is by far not ready. It needs a different approach to support --exclude= in rev-parse. -- Hannes -- 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 (Sep 2013, #03; Wed, 11)
Johannes Sixt j.s...@viscovery.net writes: Am 9/12/2013 1:32, schrieb Junio C Hamano: * jc/ref-excludes (2013-09-03) 2 commits - document --exclude option - revision: introduce --exclude=glob to tame wildcards People often wished a way to tell git log --branches (and git log --remotes --not --branches) to exclude some local branches from the expansion of --branches (similarly for --tags, --all and --glob=pattern). Now they have one. Will merge to 'next'. Please don't. This is by far not ready. It needs a different approach to support --exclude= in rev-parse. Thanks for a dose of sanity. I didn't look at rev-parse. I vaguely recall somebody offered follow-ups (was it you?) and at that point I placed this on the back-burner. -- 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 (Sep 2013, #03; Wed, 11)
Jeff King p...@peff.net writes: This description is slightly inaccurate since the re-roll. I think it is now: git config did not provide a way to set or access numbers larger than a native int on the platform; it now provides 64-bit signed integers on all platforms. Not a big deal, but it may make your life easier if this description ends up in the merge commit, and then you later try to write ReleaseNotes off of it. Thanks, this helps very much. If you are not interested in how a Git maintainer works, you can stop reading. Otherwise understanding of Documentation/howto/maintain-git.txt may be necessary to grok the below. The way I work these days is: - Add a ### cut mark to Meta/redo-jch.sh so that topics I want to have in 'master' comes before it; - Proofread the description on these topics in Meta/whats-cooking.txt; - Make a copy of RelNotes to a temporary file and have it in my Emacs; - On 'master', run Meta/redo-jch.sh -c1 -e, with emacsclient set to my EDITOR; - Edit the merge log message if necessary (and if I do so, whats-cooking needs to be also updated), but do not say C-x # yet; - Copy that final merge log message to that temporary file (it is all in the same Emacs, so this is very simple and easy) to add a new entry; - Go back to the merge log message and say C-x #, which will go back two step in this list, repeatedly processing all the topics. And then copy the temporary file over to RelNotes. -- 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 (Sep 2013, #03; Wed, 11)
Am 9/12/2013 17:24, schrieb Junio C Hamano: Johannes Sixt j.s...@viscovery.net writes: Am 9/12/2013 1:32, schrieb Junio C Hamano: * jc/ref-excludes (2013-09-03) 2 commits Thanks for a dose of sanity. I didn't look at rev-parse. I vaguely recall somebody offered follow-ups (was it you?) and at that point I placed this on the back-burner. Yes, I offered to pick up the topic as time permits. Don't hold your breath, though :-) -- Hannes -- 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 (Sep 2013, #03; Wed, 11)
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 second batch of topics are now in 'master'. 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] * es/rebase-i-no-abbrev (2013-08-25) 3 commits (merged to 'next' on 2013-09-04 at 6027805) + rebase -i: fix short SHA-1 collision + t3404: rebase -i: demonstrate short SHA-1 collision + t3404: make tests more self-contained Originally merged to 'next' on 2013-08-26 The commit object names in the insn sheet that was prepared at the beginning of rebase -i session can become ambiguous as the rebasing progresses and the repository gains more commits. Make sure the internal record is kept with full 40-hex object names. * es/rebase-i-respect-core-commentchar (2013-08-18) 1 commit (merged to 'next' on 2013-09-04 at 8c1ce68) + rebase -i: fix cases ignoring core.commentchar Originally merged to 'next' on 2013-08-20 rebase -i forgot that the comment character can be configurable while reading its insn sheet. * jc/ls-files-killed-optim (2013-08-23) 4 commits (merged to 'next' on 2013-09-04 at 20c2304) + dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage + t3010: update to demonstrate ls-files -k optimization pitfalls + ls-files -k: a directory only can be killed if the index has a non-directory + dir.c: use the cache_* macro to access the current index Originally merged to 'next' on 2013-08-27 git ls-files -k needs to crawl only the part of the working tree that may overlap the paths in the index to find killed files, but shared code with the logic to find all the untracked files, which made it unnecessarily inefficient. * jn/post-receive-utf8 (2013-08-05) 3 commits (merged to 'next' on 2013-09-04 at 3a3f480) + hooks/post-receive-email: set declared encoding to utf-8 + hooks/post-receive-email: force log messages in UTF-8 + hooks/post-receive-email: use plumbing instead of git log/show Originally merged to 'next' on 2013-08-20 Update post-receive-email script to make sure the message contents and pathnames are encoded consistently in UTF-8. * js/xread-in-full (2013-08-20) 1 commit (merged to 'next' on 2013-09-04 at 5bfb049) + stream_to_pack: xread does not guarantee to read all requested bytes Originally merged to 'next' on 2013-08-20 A call to xread() was used without a loop around to cope with short read in the codepath to stream new contents to a pack. * nd/push-no-thin (2013-08-13) 1 commit (merged to 'next' on 2013-09-04 at faa8c02) + push: respect --no-thin Originally merged to 'next' on 2013-08-14 git push --no-thin was a no-op by mistake. * rt/rebase-p-no-merge-summary (2013-08-21) 1 commit (merged to 'next' on 2013-09-04 at d8d89ee) + rebase --preserve-merges: ignore merge.log config Originally merged to 'next' on 2013-08-22 git rebase -p internally used the merge machinery, but when rebasing, there should not be a need for merge summary. * sb/mailmap-freeing-NULL-is-ok (2013-08-20) 1 commit (merged to 'next' on 2013-09-04 at c831015) + mailmap: remove redundant check for freeing memory Originally merged to 'next' on 2013-08-20 * sh/pull-rebase-preserve (2013-09-04) 1 commit (merged to 'next' on 2013-09-04 at 32a93bb) + pull: allow pull to preserve merges when rebasing Originally merged to 'next' on 2013-08-14 git pull --rebase always flattened the history; pull.rebase can now be set to preserve to invoke rebase --preserve-merges. * tf/gitweb-ss-tweak (2013-08-20) 4 commits (merged to 'next' on 2013-09-04 at 774bfbe) + gitweb: make search help link less ugly + gitweb: omit the repository owner when it is unset + gitweb: vertically centre contents of page footer + gitweb: ensure OPML text fits inside its box Originally merged to 'next' on 2013-08-22 Tweak Gitweb CSS to layout some elements better. -- [New Topics] * bc/send-email-ssl-die-message-fix (2013-09-10) 1 commit - send-email: don't call methods on undefined values When send-email comes up with an error message to die with upon failure to start an SSL session, it tried to read the error string from a wrong place. Will merge to 'next'. * jc/checkout-detach-doc (2013-09-11) 1 commit - checkout: update synopsys and documentation on detaching HEAD git checkout [--detach] commit was listed poorly in the synopsis section of its documentation. * jc/cvsserver-perm-bit-fix (2013-09-11) 1 commit - cvsserver: pick up the right mode bits git cvsserver computed the permission mode bits incorrectly for executable files. Will merge to 'next'. * jk/trailing-slash-in-pathspec (2013-09-10) 2 commits - rm: re-use parse_pathspec's
Re: What's cooking in git.git (Sep 2013, #03; Wed, 11)
On Wed, Sep 11, 2013 at 04:32:23PM -0700, Junio C Hamano wrote: * jk/config-int-range-check (2013-09-09) 5 commits (merged to 'next' on 2013-09-09 at 9ab779d) + git-config: always treat --int as 64-bit internally + config: make numeric parsing errors more clear + config: set errno in numeric git_parse_* functions + config: properly range-check integer values + config: factor out integer parsing from range checks Originally merged to 'next' on 2013-08-22 git config --int section.var 3g should somehow diagnose that the number does not fit in int (on 32-bit platforms anyway) but it did not. This description is slightly inaccurate since the re-roll. I think it is now: git config did not provide a way to set or access numbers larger than a native int on the platform; it now provides 64-bit signed integers on all platforms. Not a big deal, but it may make your life easier if this description ends up in the merge commit, and then you later try to write ReleaseNotes off of it. It also fixes the mis-detection of 32-bit overflow on certain platforms, but the only likely way to trigger that was via config --int (unless you are crazy enough to set gc.auto to 2g or something). But now that git-config is 64-bit that does not even matter, and it is probably not even worth mentioning in the release notes. -Peff -- 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
