From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Keeping Subject: Re: [PATCH v2] git-rebase: Teach rebase "-" shorthand. Date: Wed, 19 Mar 2014 19:55:03 +0000 Message-ID: <20140319195503.GD11018@serenity.lan> References: <1395226935-53044-1-git-send-email-modocache@gmail.com> <20140319180213.GB11018@serenity.lan> <20140319191217.GC11018@serenity.lan> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Brian Gesiak , git@vger.kernel.org, Torsten =?iso-8859-1?Q?B=F6gershausen?= , Tim Chase To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Mar 19 20:55:26 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WQMaD-00069u-Jj for gcvg-git-2@plane.gmane.org; Wed, 19 Mar 2014 20:55:25 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753957AbaCSTzP (ORCPT ); Wed, 19 Mar 2014 15:55:15 -0400 Received: from jackal.aluminati.org ([72.9.247.210]:41146 "EHLO jackal.aluminati.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752457AbaCSTzN (ORCPT ); Wed, 19 Mar 2014 15:55:13 -0400 Received: from localhost (localhost [127.0.0.1]) by jackal.aluminati.org (Postfix) with ESMTP id 15AE4CDA587; Wed, 19 Mar 2014 19:55:13 +0000 (GMT) X-Quarantine-ID: X-Virus-Scanned: Debian amavisd-new at serval.aluminati.org X-Spam-Flag: NO X-Spam-Score: -1 X-Spam-Level: X-Spam-Status: No, score=-1 tagged_above=-9999 required=6.31 tests=[ALL_TRUSTED=-1] autolearn=disabled Received: from jackal.aluminati.org ([127.0.0.1]) by localhost (jackal.aluminati.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id l1rluIi1wgY4; Wed, 19 Mar 2014 19:55:12 +0000 (GMT) Received: from serenity.lan (mink.aluminati.org [10.0.7.180]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by jackal.aluminati.org (Postfix) with ESMTPSA id 9A3A6CDA330; Wed, 19 Mar 2014 19:55:05 +0000 (GMT) Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.22 (2013-10-16) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Wed, Mar 19, 2014 at 12:41:31PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > On Wed, Mar 19, 2014 at 12:02:01PM -0700, Junio C Hamano wrote: > >> John Keeping writes: > >> > >> > On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: > >> >> "rebase -" with your change still says something like this: > >> >> > >> >> First, rewinding head to replay your work on top of it... > >> >> Fast-forwarded HEAD to @{-1}. > >> >> > >> >> instead of "Fast-forwarded HEAD to -". Somebody may later want > >> >> to "fix" this, making these two eye-candy output to be different > >> >> from each other, and what your test expects will no longer hold > >> >> (not that I think it is better to say "-" instead of @{-1} > >> >> there). > >> > > >> > I don't think either of these is correct. When using "-" with the > >> > commands that already support it, I have occasionally found that "-" > >> > isn't what I thought it was. > >> > > >> > Can we use `git name-rev` to put the actual name here, so that people > >> > who have not done what they intended can hopefully notice sooner? > >> > >> That sounds like a right thing to do. It however is totally > >> orthogonal to the change we are discussing, and should be done as a > >> separate patch. > > > > Is it not part of adding support for "-"? > > I thought your suggestion was: > > 'rebase @{-1}' says 'Fast-fowarded HEAD to @{-1}'. It should say > 'Fast-forwarded HEAD to 4f407407 (rebase: allow "-" short-hand > for the previous branch, 2014-03-19)' instead. > > Or it could be: > > 'rebase @{-1}' says 'Fast-fowarded HEAD to @{-1}'. It should say > 'Fast-forwarded HEAD to master' instead. > > In either case, it does not look like such a change is about > teaching "-" as a synonym to "@{-1}". My suggestion was specifically: 'rebase -' says 'Fast-forwarded HEAD to -'. It should say 'Fast-forwarded HEAD to master' instead. I'm not sure it's desirable to attempt to canonicalise whatever the user writes on the command line, but since we're special-casing '-' I think it is a good thing to print the branch name in that case.