From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IHWEHU0KWGGiSAAAgWs5BA (envelope-from ) for ; Sat, 02 Oct 2021 09:29:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id cJ0kGU0KWGFBKwAAB5/wlQ (envelope-from ) for ; Sat, 02 Oct 2021 07:29:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E52BC28C3F for ; Sat, 2 Oct 2021 09:29:16 +0200 (CEST) Received: from localhost ([::1]:43708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWZSO-00059e-37 for larch@yhetil.org; Sat, 02 Oct 2021 03:29:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWZS0-00059H-Mr for emacs-orgmode@gnu.org; Sat, 02 Oct 2021 03:28:52 -0400 Received: from ciao.gmane.io ([116.202.254.214]:60010) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWZRz-0003vw-91 for emacs-orgmode@gnu.org; Sat, 02 Oct 2021 03:28:52 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1mWZRw-0003h9-NH for emacs-orgmode@gnu.org; Sat, 02 Oct 2021 09:28:48 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Max Nikulin Subject: Re: Release 9.5 Date: Sat, 2 Oct 2021 14:28:40 +0700 Message-ID: References: <87sfxnrs5f.fsf@gnu.org> <87czopxux8.fsf@iki.fi> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <87czopxux8.fsf@iki.fi> Content-Language: en-US Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 17 X-Spam_score: 1.7 X-Spam_bar: + X-Spam_report: (1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-1.127, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633159757; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=LK9/dzB3W8MY17qsPm3BnYax7KvI3XBgWcs3xbjO2RQ=; b=W38n9haGeh1FGEU2ui/f7Nl5iNkXiOzf2KKBJs/0gLKmtn1Ha3UUjgMJek4Af2ngHT0rs4 sBP73GVNrH7tTyknnZydXCWj3WPZlFpASz/6oN3yYGm0E2okzi40jMWllzmJ7QrFOdbCLZ 4u76vtlKeg+R2xi4MrK5dxWlRrFefI2cAvcEFzkegU2JatXDf+LUd3FO9I4PgBcb4oyvj1 FFCNHS1yCzl5xvNKTigesB7yaBKJ1EM/+X3XEgD3hsRzzoGl/Or3CMc82OESjdviEaDokQ xdYFoT2x9hVB6vp96hmONkeYD8lzBujiAgr26aBtY24otrtGgP4hL+LuAOnn/Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633159757; a=rsa-sha256; cv=none; b=sauhCjQDg25khuuTOZANrirJx6aGRCVx4HcctDf0COHrYa29X0H/UPW+l9SshyXt76GC/B bAA5MIQ6bjmSM0nv13Zht2YjkFuztYh0IbwzuEeBD1tl6s6r3dn0chuBIsnXRbgjek6qzW i1tt6hfeT8ZqMcQFDSsZoiAD41ozWV2UFTEiGE7oxeqsnUjgJWWGFPBTq6+UBNkE9T8MxS SmHlO+i97cDU4Tm0vAMr1wiAVNQAPDLs0+4E85YhXqcwJaA2wyxSI4tG8wM8Yig5Fn8yTv Uj6YwCz3pKSZi77GQwoi4Z1eoXGPOoQ3Y0Gw6mWidBM0NaMHHCDqw7aXLmAXLQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -0.71 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: E52BC28C3F X-Spam-Score: -0.71 X-Migadu-Scanner: scn1.migadu.com X-TUID: dNgBlSvUHr0H On 01/10/2021 10:53, Jarmo Hurri wrote: > Bastien writes: > > I just ran 'git pull' and got a warning and an error: > > warning: redirecting to https://git.savannah.gnu.org/git/emacs/org-mode.git/ > Your configuration specifies to merge with the ref 'refs/heads/maint' > from the remote, but no such ref was fetched. Maybe you are trying to pull while you are on master branch from old orgmode.org repository. You should either remove or rename old remote git remote rm origin or git remote rename origin orgmode_org and git remote add origin https://git.savannah.gnu.org/git/emacs/org-mode.git git fetch origin git checkout main # or bugfix Even if you already added new repository earlier then maybe you are still on the master branch from old repository. Run "git fetch" with proper remote name and git checkout main git pull (not "maint" that is "bugfix" now) should help. The commands that should help to determine current state of your repository git remote -v show git status -sb > Do I need to start a new clone from scratch, or is there a fix for this? Git may works with several remotes, so it is not necessary. > (I honestly have _no recollection_ of what changes I have made, and what > changes need to be made, to the cloned repository locally in order for > 'make' to run successfully.) If you have a personal local branch, checkout it and rebase to "main" or "bugfix". If it is (or was) tracking remote changes, it may require adjustment.