{"thread":{"id":"6148","subject":"What's cooking in git.git (topics)","startedAt":"2006-12-29T05:44:38Z","lastAt":"2006-12-30T12:54:09Z","messageCount":8,"participants":["Junio C Hamano","Johannes Schindelin","Jakub Narebski","Nicolas Pitre","Raimund Bauer"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"30465","messageId":"7vtzzfp86x.fsf@assigned-by-dhcp.cox.net","threadId":"6148","inReplyTo":null,"subject":"What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-29T05:44:38Z","receivedAt":"2006-12-29T05:44:38Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking.  Commits prefixed\nwith '-' are only in 'pu' while commits prefixed with '+' are\nin 'next'.  The topics list the commits in reverse chronological\norder.\n\n* sp/merge (Thu Dec 28 02:35:34 2006 -0500) 5 commits\n - Improve merge performance by avoiding in-index merges.\n - Avoid git-fetch in `git-pull .` when possible.\n + Use merge-recursive in git-am -3.\n + Allow merging bare trees in merge-recursive.\n + Move better_branch_name above get_ref in merge-recursive.\n\nGood intentions, very attractive, somewhat disruptive and might\nbe risky breaking existing users.  I'd like at least the earlier\nparts to be in v1.5.0-rc1.\n\n* jc/curl (Wed Dec 27 13:59:26 2006 -0800) 1 commit\n + Work around http-fetch built with cURL 7.16.0\n\nWaiting for an Ack.\n\n* sp/mmap (Wed Dec 27 02:46:23 2006 -0500) 22 commits\n - Fix random segfaults in pack-objects.\n - Cleanup read_cache_from error handling.\n - Replace mmap with xmmap, better handling MAP_FAILED.\n - Release pack windows before reporting out of memory.\n - Default core.packdGitWindowSize to 1 MiB if NO_MMAP.\n - Test suite for sliding window mmap implementation.\n - Create pack_report() as a debugging aid.\n - Support unmapping windows on 'temporary' packfiles.\n - Improve error message when packfile mmap fails.\n - Ensure core.packedGitWindowSize cannot be less than 2 pages.\n - Load core configuration in git-verify-pack.\n - Fully activate the sliding window pack access.\n - Unmap individual windows rather than entire files.\n - Document why header parsing won't exceed a window.\n - Loop over pack_windows when inflating/accessing data.\n - Replace use_packed_git with window cursors.\n - Refactor how we open pack files to prepare for multiple windows.\n - Create read_or_die utility routine.\n - Use off_t for index and pack file lengths.\n - Refactor packed_git to prepare for sliding mmap windows.\n - Introduce new config option for mmap limit.\n - Replace unpack_entry_gently with unpack_entry.\n\nKnown breakage exists that this series is highly suspected.\nWill diagnose and merge to 'next' after fixing.\n\n* jc/diff-apply-patch (Fri Sep 22 16:17:58 2006 -0700) 1 commit\n + git-diff/git-apply: make diff output a bit friendlier to GNU patch\n   (part 2)\n\nI promised this to wait until February.  Most likely to be in\nv1.5.1.   \n\n* jc/diff (Mon Dec 25 01:08:50 2006 -0800) 2 commits\n - test-para: combined diff between HEAD, index and working tree.\n - para-walk: walk n trees, index and working tree in parallel\n* jc/explain (Mon Dec 4 19:35:04 2006 -0800) 1 commit\n - git-explain\n* jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit\n + git-merge: preserve and merge local changes when doing fast\n   forward\n* jc/web (Wed Nov 8 14:54:09 2006 -0800) 1 commit\n - gitweb: steal loadavg throttle from kernel.org\n* jc/pickaxe (Sun Nov 5 11:52:43 2006 -0800) 1 commit\n - blame: --show-stats for easier optimization work.\n\nThese are on hold or will not be merged ever.\n"},{"id":"30480","messageId":"Pine.LNX.4.63.0612291853210.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6148","inReplyTo":"7vtzzfp86x.fsf@assigned-by-dhcp.cox.net","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-29T17:55:56Z","receivedAt":"2006-12-29T17:55:56Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 28 Dec 2006, Junio C Hamano wrote:\n\n> * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit\n>  + git-merge: preserve and merge local changes when doing fast\n>    forward\n\nI'd like this, but behind a command line switch. And in addition to saying \n\"cannot merge, blabla needs update\", git could spit out \"if you want to \nrisk a 3way merge, go ahead and add the --preserve-local flag to \ngit-merge\".\n\nComments?\n\nCiao,\nDscho\n"},{"id":"30481","messageId":"en3la8$5t7$1@sea.gmane.org","threadId":"6148","inReplyTo":"Pine.LNX.4.63.0612291853210.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: What's cooking in git.git (topics)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-12-29T18:06:54Z","receivedAt":"2006-12-29T18:06:54Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Johannes Schindelin wrote:\n\n> Hi,\n> \n> On Thu, 28 Dec 2006, Junio C Hamano wrote:\n> \n>> * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit\n>>  + git-merge: preserve and merge local changes when doing fast\n>>    forward\n> \n> I'd like this, but behind a command line switch. And in addition to saying \n> \"cannot merge, blabla needs update\", git could spit out \"if you want to \n> risk a 3way merge, go ahead and add the --preserve-local flag to \n> git-merge\".\n> \n> Comments?\n\nGood idea.\n\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n"},{"id":"30482","messageId":"7vhcveo8yl.fsf@assigned-by-dhcp.cox.net","threadId":"6148","inReplyTo":"Pine.LNX.4.63.0612291853210.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: What's cooking in git.git (topics)","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-29T18:25:38Z","receivedAt":"2006-12-29T18:25:38Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> On Thu, 28 Dec 2006, Junio C Hamano wrote:\n>\n>> * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit\n>>  + git-merge: preserve and merge local changes when doing fast\n>>    forward\n>\n> I'd like this, but behind a command line switch. And in addition to saying \n> \"cannot merge, blabla needs update\", git could spit out \"if you want to \n> risk a 3way merge, go ahead and add the --preserve-local flag to \n> git-merge\".\n>\n> Comments?\n\nI think what you propose is in line is what I originally wanted\nto do, but I backburnered it exactly because I did not like the\n\"if you want to risk a 3-way\" phrase.  It's not the wording, but\nthe fact that I have to say \"risk\" bothers me.  No matter how\nyou cut it, it _is_ risky, and indicates to me that we are\nsomehow doing this in a wrong way. I have a nagging suspicion\nthat there may be a better approach, but I haven't found one.\n\nBut you are welcome to take a crack at it.\n"},{"id":"30494","messageId":"Pine.LNX.4.64.0612292219280.18171@xanadu.home","threadId":"6148","inReplyTo":"Pine.LNX.4.63.0612291853210.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: What's cooking in git.git (topics)","fromName":"Nicolas Pitre","fromEmail":"nico@cam.org","sentAt":"2006-12-30T03:21:20Z","receivedAt":"2006-12-30T03:21:20Z","isPatch":false,"sender":{"key":"nico@fluxnic.net","avatar":"https://avatars.githubusercontent.com/u/702790?v=4"},"body":"On Fri, 29 Dec 2006, Johannes Schindelin wrote:\n\n> Hi,\n> \n> On Thu, 28 Dec 2006, Junio C Hamano wrote:\n> \n> > * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit\n> >  + git-merge: preserve and merge local changes when doing fast\n> >    forward\n> \n> I'd like this, but behind a command line switch. And in addition to saying \n> \"cannot merge, blabla needs update\", git could spit out \"if you want to \n> risk a 3way merge, go ahead and add the --preserve-local flag to \n> git-merge\".\n> \n> Comments?\n\nIs there really a point for not always doing it?\n\nIOW, if you really want a command line switch, maybe it should be used \nto prevent the above not to allow it?\n\n\nNicolas\n"},{"id":"30497","messageId":"Pine.LNX.4.63.0612301217010.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6148","inReplyTo":"Pine.LNX.4.64.0612292219280.18171@xanadu.home","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-30T11:22:04Z","receivedAt":"2006-12-30T11:22:04Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 29 Dec 2006, Nicolas Pitre wrote:\n\n> On Fri, 29 Dec 2006, Johannes Schindelin wrote:\n> \n> > On Thu, 28 Dec 2006, Junio C Hamano wrote:\n> > \n> > > * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit\n> > >  + git-merge: preserve and merge local changes when doing fast\n> > >    forward\n> > \n> > I'd like this, but behind a command line switch. And in addition to \n> > saying \"cannot merge, blabla needs update\", git could spit out \"if you \n> > want to risk a 3way merge, go ahead and add the --preserve-local flag \n> > to git-merge\".\n> > \n> > Comments?\n> \n> Is there really a point for not always doing it?\n> \n> IOW, if you really want a command line switch, maybe it should be used \n> to prevent the above not to allow it?\n\nThere is a drawback to enabling this all the time. If the merge screws up \nwith gazillions of conflicts, because I pulled the wrong branch, I am so \nused to \"git reset --hard\". Bummer. All my changes lost.\n\nThat is why we encourage commit-before-pull, to have a saved state.\n\n(Of course, the correct thing would not be \"git reset --hard\", but rather \n\"git diff --ours | git apply -R; git reset\", but that's a tad long, no?)\n\nCiao,\nDscho\n"},{"id":"30500","messageId":"45965A82.8030903@gmx.net","threadId":"6148","inReplyTo":"Pine.LNX.4.63.0612301217010.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: What's cooking in git.git (topics)","fromName":"Raimund Bauer","fromEmail":"ray007@gmx.net","sentAt":"2006-12-30T12:24:34Z","receivedAt":"2006-12-30T12:24:34Z","isPatch":false,"sender":{"key":"ray007@gmx.net","avatar":null},"body":"* Johannes Schindelin wrote, On 30.12.2006 12:22:\n> (Of course, the correct thing would not be \"git reset --hard\", but rather \n> \"git diff --ours | git apply -R; git reset\", but that's a tad long, no?)\nThen maybe introduce \"git reset --ours\" which does exactly that?\n\n-- \nbest regards\n\n  Ray\n"},{"id":"30501","messageId":"Pine.LNX.4.63.0612301350580.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6148","inReplyTo":"45965A82.8030903@gmx.net","subject":"Re: What's cooking in git.git (topics)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-30T12:54:09Z","receivedAt":"2006-12-30T12:54:09Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sat, 30 Dec 2006, Raimund Bauer wrote:\n\n> * Johannes Schindelin wrote, On 30.12.2006 12:22:\n> > (Of course, the correct thing would not be \"git reset --hard\", but rather\n> > \"git diff --ours | git apply -R; git reset\", but that's a tad long, no?)\n> Then maybe introduce \"git reset --ours\" which does exactly that?\n\nThat is possible.\n\nBut does it make sense? \n\nIt is a volatile state, and errors are too easy. So I think it makes sense \nto have to _ask_ for such a state.\n\n(Having said that, I think that it actually might make sense for bisecting \nan error where you _need_ a local patch to get it running to begin with.)\n\nCiao,\nDscho\n"}]}