From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: [PATCH 0/2] Random patches from my tree Date: Mon, 27 Oct 2008 13:37:22 -0700 (PDT) Message-ID: References: Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII To: Git Mailing List , Junio C Hamano X-From: git-owner@vger.kernel.org Mon Oct 27 21:39:32 2008 connect(): Connection refused Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KuYs6-0002m0-Ka for gcvg-git-2@gmane.org; Mon, 27 Oct 2008 21:39:31 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751584AbYJ0UiR (ORCPT ); Mon, 27 Oct 2008 16:38:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751193AbYJ0UiR (ORCPT ); Mon, 27 Oct 2008 16:38:17 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:41195 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750782AbYJ0UiQ (ORCPT ); Mon, 27 Oct 2008 16:38:16 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id m9RKbMb2016802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 27 Oct 2008 13:37:23 -0700 Received: from localhost (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id m9RKbMXs018874; Mon, 27 Oct 2008 13:37:22 -0700 In-Reply-To: User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) X-Spam-Status: No, hits=-3.941 required=5 tests=AWL,BAYES_00,OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Mon, 27 Oct 2008, Linus Torvalds wrote: > > So the second one allows things like > > git log --pretty=oneline --source --all A better example may have --abbrev-commit, at which point my current git tree looks like this for me: 52be8b3... refs/heads/master Add a 'source' decorator for commits affba33... refs/heads/master Add file delete/create info when we overflow rename 6806f78... refs/remotes/origin/pu Merge branch 'ar/mksnpath' into pu 058412d... refs/remotes/origin/pu Fix potentially dangerous uses of mkpath and g 356af64... refs/remotes/origin/pu Merge branch 'ar/maint-mksnpath' into HEAD 9fa03c1... refs/remotes/origin/pu Fix potentially dangerous uses of mkpath and g 94cc355... refs/remotes/origin/pu Fix mkpath abuse in dwim_ref and dwim_log of s 108bebe... refs/remotes/origin/pu Add mksnpath which allows you to specify the o 6af1fc2... refs/remotes/origin/man Autogenerated manpages for v1.6.0.3-523-g304d 61b1229... refs/remotes/origin/html Autogenerated HTML docs for v1.6.0.3-523-g30 f3ce133... refs/remotes/origin/pu Merge branch 'jc/send-pack-tell-me-more' into 2b37e3a... refs/remotes/origin/pu Merge branch 'jk/renamelimit' into pu .. ie you can see the the branch that the commits are on. An example of the ambiguous nature would be 304d058... refs/remotes/origin/HEAD Merge branch 'maint' ie because the HEAD and 'master' branches of refs/remotes/origin are the same, it's ambiguous which one to take, and git will have picked one at random. And obviously when you hit a point where two branches meet again, it really will depend on which branch we happened to be parsing at the time (which generally is "which branch had a commit date that was further back in history"). Another known deficiency: "gitk --source" doesn't work (neither does "gitk --decorate" for that matter). gitk gets very upset indeed if you try, and sucks up CPU cycles in some infinite loop. Linus