From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Thu, 20 Nov 2014 17:45:36 +0200 Message-ID: <838uj57u5b.fsf@gnu.org> References: <871toysqyq.fsf@rosalinde.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416498416 4876 80.91.229.3 (20 Nov 2014 15:46:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 20 Nov 2014 15:46:56 +0000 (UTC) Cc: stephen.berman@gmx.net, emacs-devel@gnu.org To: Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 20 16:46:50 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 1XrTwX-00024T-BY for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 16:46:49 +0100 Original-Received: from localhost ([::1]:35982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrTwW-0004Z0-RN for ged-emacs-devel@m.gmane.org; Thu, 20 Nov 2014 10:46:48 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrTvW-0003mp-Ei for emacs-devel@gnu.org; Thu, 20 Nov 2014 10:45:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrTvP-0001p8-Q1 for emacs-devel@gnu.org; Thu, 20 Nov 2014 10:45:46 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:53308) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrTvP-0001ov-Bo for emacs-devel@gnu.org; Thu, 20 Nov 2014 10:45:39 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NFC00I00GWVUR00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Thu, 20 Nov 2014 17:45:37 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFC00I0GH41FL80@a-mtaout20.012.net.il>; Thu, 20 Nov 2014 17:45:37 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:177874 Archived-At: > Date: Thu, 20 Nov 2014 10:29:30 +0700 > From: Yuri Khan > Cc: Emacs developers > > > GitForEmacsDevs says this: > > > > If you are a committer, you can merge to the upstream master directly. > > > > First, update your repository: > > > > cd $DEVHOME/emacs > > git checkout master > > git pull > > git merge TASKNAME > > git push > > > > Run the tests: > > > > make check > > > > and then commit > > > > git status > > git commit -m "fixes debbugs:12345" > > > > which merges all your new commits to the upstream master. > > > > I don't understand why `git commit' follows `git push' here (or why > > there isn't another `git push' after `git commit'). > > Indeed, the instruction quoted above is strange. These instructions were simply wrong. You will see that I raised some of these issues as early as last January: http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00790.html but nothing was done about that. I now fixed the instructions as best I could; please read and comment. There are still issues that I'd like to be sure about before I fix them. Would people please comment on these: . the instructions say that a "git commit" is necessary even when the merge is without conflicts, which AFAIK is incorrect with Git . do we want to tell there that "pull --rebase" is recommended? that would solve some of the issues the instructions are forced to explain in so many words, which unnecessarily complicates them . do we want to explicitly recommend 2 different clones, one each for master and the release branch? there's nothing in the instructions about this, or about working with 2 divergent branches in general . GitQuickStartForEmacsDevs advises to use "git ci -a"; why not suggest the same in GitForEmacsDevs? it seems a simpler setup . there's a link to GitForEmacsCasualDevs, which doesn't exist. Do we need yet another, 3rd set of instructions, in addition to the 2 we already have?