From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Davis Herring Newsgroups: gmane.emacs.devel Subject: Re: Git question: when using branches, how does git treat working files when changing branches? Date: Thu, 29 Oct 2015 11:45:27 -0600 Organization: XCP-1 Message-ID: <56325B37.6080904@lanl.gov> References: <20151028192017.GC2538@acm.fritz.box> <87k2q6wy8p.fsf@linaro.org> <20151028223252.GD2538@acm.fritz.box> <87vb9qd2h4.fsf@wanadoo.es> <20151028235340.GE2538@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1446140763 670 80.91.229.3 (29 Oct 2015 17:46:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 29 Oct 2015 17:46:03 +0000 (UTC) Cc: =?ISO-8859-1?Q?=D3scar_Fuentes?= , emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Oct 29 18:45:45 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZrrGi-0002cy-0d for ged-emacs-devel@m.gmane.org; Thu, 29 Oct 2015 18:45:44 +0100 Original-Received: from localhost ([::1]:45618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrrGh-000739-8J for ged-emacs-devel@m.gmane.org; Thu, 29 Oct 2015 13:45:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrrGZ-000734-1g for emacs-devel@gnu.org; Thu, 29 Oct 2015 13:45:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrrGT-0003tY-Pv for emacs-devel@gnu.org; Thu, 29 Oct 2015 13:45:34 -0400 Original-Received: from proofpoint4.lanl.gov ([2001:400:4210:400::a4]:40081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrrGT-0003tU-Gf for emacs-devel@gnu.org; Thu, 29 Oct 2015 13:45:29 -0400 Original-Received: from mailrelay2.lanl.gov (mailrelay2.lanl.gov [128.165.4.103]) by mailgate4.lanl.gov (8.15.0.59/8.15.0.59) with ESMTP id t9THjRun026063; Thu, 29 Oct 2015 11:45:27 -0600 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by mailrelay2.lanl.gov (Postfix) with ESMTP id 789A8EC8CD1; Thu, 29 Oct 2015 11:45:27 -0600 (MDT) X-NIE-2-Virus-Scanner: amavisd-new at mailrelay2.lanl.gov Original-Received: from [128.165.123.233] (xray-r09.lanl.gov [128.165.123.233]) by mailrelay2.lanl.gov (Postfix) with ESMTP id 6658AEC8CCC; Thu, 29 Oct 2015 11:45:27 -0600 (MDT) User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.18) Gecko/20110717 Lanikai/3.1.11 In-Reply-To: <20151028235340.GE2538@acm.fritz.box> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.15.21, 1.0.33, 0.0.0000 definitions=2015-10-29_11:2015-10-28, 2015-10-29, 1970-01-01 signatures=0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:400:4210:400::a4 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:192919 Archived-At: > It wouldn't work well for me. The word "commit" has a meaning, > something like "hand over on a permanent basis". And, with a limited scope, that's what "git commit" does: hands over your code (actually the "index" or "staging area") to the repository permanently (unless/until countermanded, of course). That the destination is "your repository" rather than "the Emacs central repository" does not prevent its being a commit, but it does (as has been discussed to death elsewhere on this thread) change the social implications of the commit drastically. > If I were were to commit unfinished changes just for lack of somewhere > proper to store them, inevitably some of these changes would find > themselves becoming permanent, embarassingly so. Having continually to > remember to cancel a commit each time I change branches would be an > extra level of stress, of which there is already enough with git. If you want, maintain (local) branches named things like "eligible" and "scratch" (perhaps such a pair per logical change you're working on). You can then feel free to commit regardless of quality to scratch, knowing that you would never push such a branch. That frees your attention to switch branches. When you come back, you can rebase/amend the scratch commit(s) as needed, then put them onto eligible. It's a separate question of when "eligible" is complete enough to be worth pushing to a public location. The change (for any given piece of work) from scratch to eligible is then a question of quality, whereas from eligible to Savannah is a question of completeness. It's all reasonably self-explanatory once you choose your names. Davis -- This product is sold by volume, not by mass. If it appears too dense or too sparse, it is because mass-energy conversion has occurred during shipping.