From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#68183: 28.3; vc-dir fails when I have a certain branch checked out Date: Thu, 22 Aug 2024 15:46:56 +0300 Message-ID: <86r0agsp1b.fsf@gnu.org> References: <8734vici68.fsf@tromey.com> <83y1da17zw.fsf@gnu.org> <87y1dab03x.fsf@tromey.com> <87h6jun400.fsf@gmail.com> <878r3q2jfx.fsf@gmail.com> <877cj6izv7.fsf@gmail.com> <87zfuyrrfz.fsf@gmail.com> <283baeb9-d427-45a3-92d5-5e6c095b87ad@gutov.dev> <87ttl43f2x.fsf@gmail.com> <06a946b4-b06a-4e10-93d5-b6d6b8bd9fcf@gutov.dev> <87h6bwqujo.fsf@gmail.com> <9446a412-5221-4466-b7e8-937957fd82f2@gutov.dev> <877ccbhg8m.fsf@gmail.com> <86frqzwft6.fsf@gnu.org> <87msl5av0l.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17369"; mail-complaints-to="usenet@ciao.gmane.io" Cc: dmitry@gutov.dev, juri@linkov.net, 68183@debbugs.gnu.org, tom@tromey.com, spwhitton@spwhitton.name To: =?UTF-8?Q?K=C3=A9vin?= Le Gouguec Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 22 14:47:29 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sh7Ds-0004Ll-Ns for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 22 Aug 2024 14:47:29 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sh7Dl-00063D-7X; Thu, 22 Aug 2024 08:47:21 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sh7Dh-00062q-La for bug-gnu-emacs@gnu.org; Thu, 22 Aug 2024 08:47:19 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sh7Dg-0000Or-CQ for bug-gnu-emacs@gnu.org; Thu, 22 Aug 2024 08:47:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-version:References:In-Reply-To:From:Date:To:Subject; bh=B4C7GS/qehQIjLJj0iTDeKnhJc1EUMPFIaw1AOl0ggs=; b=LK/V5Mpnn7fueEA6Z4tbhxuPumf1WHekAMsMZX5gkJw8iIJYEGmCF/YlQHElOiFQ/wLfgPSM548kcwIr1C+Qiq0pTPR1sZMIj+7mAJKmBHLXFkbA5lBAc4lfcggAYsABI9hAtJoCUwGVxpWeWvd+N0+owCTZdrFYNVRgcO7BToKqVmzC9BTfFULO41KPxe9Fngx8T35Ie1ity6lPPcEYRT/hwT3Fb1ECAryyw8AIvnzp2+JsAytibu6jq0GunRj/4gTDSKENxxnQo2okzEPKON2sb9V89n5BX4JRbpWIfu3dKbPqVWsQTrj63WOeQQm1u7C59xwFsBE2EomWIUdtvA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sh7EQ-00013e-3l for bug-gnu-emacs@gnu.org; Thu, 22 Aug 2024 08:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 22 Aug 2024 12:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68183 X-GNU-PR-Package: emacs Original-Received: via spool by 68183-submit@debbugs.gnu.org id=B68183.17243308784055 (code B ref 68183); Thu, 22 Aug 2024 12:48:02 +0000 Original-Received: (at 68183) by debbugs.gnu.org; 22 Aug 2024 12:47:58 +0000 Original-Received: from localhost ([127.0.0.1]:37033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sh7EM-00013K-G1 for submit@debbugs.gnu.org; Thu, 22 Aug 2024 08:47:58 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:60364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sh7EK-000133-5W for 68183@debbugs.gnu.org; Thu, 22 Aug 2024 08:47:57 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sh7DU-0000O4-03; Thu, 22 Aug 2024 08:47:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=B4C7GS/qehQIjLJj0iTDeKnhJc1EUMPFIaw1AOl0ggs=; b=fhlCM9c+T9gDRDYdAs4A VEvjc5gDKIIaY14rd/2cjXMAYP0c61KFjsUdJAjKJzlzdmYDGt+SWeBqSJZA2IqOp+nkmgNByI1Va uhQTJlLyTs4rR1qnd0GDxy7F6bsDPvm1YHcqr1W9Hzlo95JLkS78qGZYKM9R9cNITqQjjoebGEbXD 69Tua/fMFg0fBIsPRZGea33YRYf2sfjYZ1PxDZL0b6mgRPfeSvMnTsv//RexE/Qmfdxx7iQkBiP/S qYUJGyCyAmkkDrolPA8BEKGLI8RwyTX0687LSLG1Oc9lIZ4Q4GzKWMVKWZ7Kdxh76uRchhxG1onp4 7ErSbMzqIKy4/Q==; In-Reply-To: <87msl5av0l.fsf@gmail.com> (message from =?UTF-8?Q?K=C3=A9vin?= Le Gouguec on Thu, 22 Aug 2024 09:15:06 +0200) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:290534 Archived-At: > From: Kévin Le Gouguec > Cc: dmitry@gutov.dev, 68183@debbugs.gnu.org, tom@tromey.com, > spwhitton@spwhitton.name, juri@linkov.net > Date: Thu, 22 Aug 2024 09:15:06 +0200 > > +--- > +*** VC Directory buffers now display the upstream branch in Git repositories. > +The "upstream branch" is the branch 'vc-pull' fetches changes from by > +default. In Git terms, the upstream branch of branch B is determined by > +configuration variables branch.B.remote and branch.B.merge. That's okay, with the following nit: I find phrases like "the branch 'vc-pull' fetches changes from by default" hard to grasp. I prefer rephrasing to make the grammar simpler: The "upstream branch" is the branch from which 'vc-pull' fetches changes by default.