From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sat, 15 Nov 2014 18:47:48 +0100 Message-ID: References: <87sihkicso.fsf@Rainer.invalid> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416073718 3533 80.91.229.3 (15 Nov 2014 17:48:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 17:48:38 +0000 (UTC) Cc: emacs-devel@gnu.org To: Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 18:48:32 2014 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 1XphSZ-0003Eu-PC for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 18:48:31 +0100 Original-Received: from localhost ([::1]:41439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XphSZ-0003mg-ES for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 12:48:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XphSG-0003mP-Tl for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:48:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XphSC-0003f2-3e for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:48:12 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:35601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XphSB-0003em-Qe for emacs-devel@gnu.org; Sat, 15 Nov 2014 12:48:08 -0500 Original-Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XphRs-0008CB-EY; Sat, 15 Nov 2014 18:47:48 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAFVBMVEUAAAYEBxcGCht+SWgC Aw4YFCYBAQinjIYvAAACPklEQVQ4jU1Twa7jIAzkkOUOSvcObfYHIu5lhbg3PN6ZSln+/xN2xk6l h9pU9WQ89tiYI/K4tcw5zDDGzHlmV40JV7xMRgWYArw8gFBKJQMUO+ssuVrzRUZwRKw1c0yeAoYA zgEhZU58Sikgv4RAyhxjFiYCeai4ixdjnnwfuQY0nOYq09hh5/wX+p/J6hRAqmnxD8jTVgBWy42s amhJfBgUGLRzz3RrxrcipYFGCIiFW++d5vTUt9cwFZ1Sw7mty2n7nlIXx8wDQIgdkf06AqBcEW9X MLU99aeY+Yo/gY54V5d1Hq1Jpt4alJhqMQ/pL3W8TEJPTRhTqgoO9STV6O0jLr1tXQGKJRX/8trH Tv0U7/uH8f320YcNufe9pchOh7j7vQjQ2MF9B9D604pGBhCFkTYCW+J4M8RdDF6MSjHBxtY5eAXQ IIB7Onrcjt7POhZ/Acpgj0cjYLOaGFgMugMHDEx5rvAqRHcBdBAHky0FDI8Gb5qKc9we2LvsdFBO VvE6WE97umupAfAinIiv2B6bvXk53V0CWNGTwLBvZw4nudaMl8EAgJ00p1fbAfwQwcYBUA1fmOuj Psy5XQ2qiIbBMAvFOSmv9c6qAFM9HBvEN0P1rCyZjwyGk50OmQHG+APgwJii2FKKxVWTqujV6q5L CGBI72cZSy3iFZGMqsalYJY1a1UxsNb69zevOK7scusKBLGqYnQK2Nv+sYTXlhWdIj7eOzRc9E6B X7w+PSWuBt3FNfRB5sFiab+Z5T8XMO3kc+UunAAAAABJRU5ErkJggg== X-Now-Playing: Joni Mitchell's _Shadows And Light (2)_: "Shadows And Light" X-Hashcash: 1:23:141115:stromeko@nexgo.de::Unnb7icQUdE3eV9U:0000000000000000000000000000000000000000000035Gd X-Hashcash: 1:23:141115:emacs-devel@gnu.org::/dpYyBQO78ZudfHd:000000000000000000000000000000000000000000prax In-Reply-To: <87sihkicso.fsf@Rainer.invalid> (Achim Gratz's message of "Sat, 15 Nov 2014 18:39:03 +0100") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-MailScanner-ID: 1XphRs-0008CB-EY MailScanner-NULL-Check: 1416678469.49489@W4aGOfXQYLo7WSqa+6wXfQ X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.224.195 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:177214 Archived-At: Achim Gratz writes: > Lars Magne Ingebrigtsen writes: >> Then we want to clone the repository. We normally want to have both >> the current trunk and the emacs-24 branch. > > Trunk is now known as master. We can call the trunk the trunk if we want to. >> git clone @git.sv.gnu.org:/srv/git/emacs.git > > Better to do the clone either with git: or http: public access and leave > the ssh credentials strictly for pushing to upstream. You do this by > adding a section like this to your global git config (you could add it > to the repo config, but that doesn#t make much sense if you're having > multiple clones around): > > [url "git+ssh://@git.sv.gnu.org/srv/git/emacs.git"] > pushInsteadOf = git://git.sv.gnu.org/emacs.git > > That should help the server load a bit. TLS is not a major CPU hog these days. And we're not 10K developers accessing the repository, so this just seems like make-work. >> mv emacs trunk > > If you're going to rename the directory, you'd be better off just > telling git clone what you want it to be named: > > git clone -b master git://git.sv.gnu.org/emacs.git master I don't see how that's shorter or easier to remember. >> ./trunk/admin/git-new-workdir > > This doesn't exist and whether or not git-workdir or even separate > working trees is what you'll want is debatable. If this is the work flow we're going with, it will exist. > Personally I just switch branches and build out-of-tree, but for > something as large as Emac I can see the utility of having separate > workdirs. Well, that's nice for you, but that's not how many of us prefer to work. We want both branches at the same time. > If the directories are side-by side anyway, then > > git clone -b emacs-24 --reference emacs git://git.sv.gnu.org/emacs.git emacs-24 > > is just as good. Somebody else will have to weigh in on that. I have no idea. >> git pull --rebase > > When working with upstream this is good practrice, but if you're going > to do that anyway, just configure your branch with "rebase = true". Or > configure "autosetuprebase = true" on a repo-wide or global basis so Git > will do that by default (you can always change that later of course). Ditto. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no