Re: What's cooking in git.git (topics)

From: Junio C Hamano <junkio@cox.net>
Date: Dec 6, 2006, 22:14 UTC
Message-ID: <7vmz60y8mw.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <el7dsn$9a6$1@sea.gmane.org>

Jakub Narebski <jnareb@gmail.com> writes:

Show 13 quoted lines

>> * jc/3way (Wed Nov 29 18:53:13 2006 -0800)
>>  + git-merge: preserve and merge local changes when doing fast forward
>> 
>>  This allows you to run a 'git merge' (or 'git pull') that
>>  results in a fast-forward merge that updates a path your
>>  working tree has modified locally; it merges your local changes
>>  into the updated version, in the same way the branch switching
>>  'git checkout -m' works.  It has been in next for some time and
>>  unless we hear somebody scream I think it is Ok to merge to
>>  'master'.
>
> Very nice. Less suprises for CVS users (with "update then commit"
> mentality/habits).

This only makes "update; edit; update; commit" to work. "edit; commit; edit; commit; edit; update; commit" would not work, because you would be faced to resolving the conflicts upon the last update while your working tree is already contaminated with your own changes (it can be done and experienced people have done so, but you are talking about "CVS users" here).

We'd be much better off to encourage users to shake "update then commit" habit, especially if they are on a slow link.

>> * jc/web (Wed Nov 8 14:54:09 2006 -0800)
>>  - gitweb: steal loadavg throttle from kernel.org
>
> Is having loadavg in gitweb, and not configured in server good idea?

Have you looked at the code to see what it does?

Show 10 quoted lines

>> * lh/branch-rename (Thu Nov 30 03:16:56 2006 +0100)
>>  + git-branch: let caller specify logmsg
>>  + rename_ref: use lstat(2) when testing for symlink
>>  + git-branch: add options and tests for branch renaming
>> 
>>  I do not rename branches myself and do not see a need for this
>>  nor I have tested it in real-world setting.  The code seemed
>>  clean and may be 'master' material.
>
> I'd like to have this, but it MUST work well with reflogs for me.

Then test it and fix breakage if any please.