From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8FM1E4w6oWLPBAEAbAwnHQ (envelope-from ) for ; Thu, 09 Jun 2022 02:10:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id EylcEow6oWLXyAAAG6o9tA (envelope-from ) for ; Thu, 09 Jun 2022 02:10:52 +0200 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 AE7C8209BA for ; Thu, 9 Jun 2022 02:10:47 +0200 (CEST) Received: from localhost ([::1]:60404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nz5l8-000745-Bb for larch@yhetil.org; Wed, 08 Jun 2022 20:10:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nz5jl-00073i-F9 for emacs-orgmode@gnu.org; Wed, 08 Jun 2022 20:09:21 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:39822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nz5jj-0004hV-BF for emacs-orgmode@gnu.org; Wed, 08 Jun 2022 20:09:21 -0400 Received: by mail-ed1-x52d.google.com with SMTP id v25so29125009eda.6 for ; Wed, 08 Jun 2022 17:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=kJAufcn24tbNp63yzLj5OOLyaVVn5Okm9Bh8GAUthGU=; b=XzQTupabnD0+stIy+1uNppC2bQqkSfp9F8ke1POvRea01lR69WGPIXRBoELaJpgzJE mcTTmELxfqD/nL+9lwxxaE7AgSRDreU4TFL0tz6HSP67Ymp/l8VJcmmMcOZPYfl8Gdq+ ZdssSNAUSWP9Lf7l//MYCsJoi7UpweftSDit/8RrlRxxQCDsxvuESo07FZKRDzIybv/f lillLZIq+4WWkJvpFZtwZzcO1nAc7AIDaonbG5vZIxtcRMsDEOuRB0lp213YaziAkmB2 xiYKMIp5hW1cWl74nN05gJgEeAv1gYzIRNgm2xpMiZUPbWT64l+UoMmYlb9bC5xyOcT7 K7BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=kJAufcn24tbNp63yzLj5OOLyaVVn5Okm9Bh8GAUthGU=; b=wzLh0QGFA6E4vCLfzb2J0idC8QIyZ0ltOStzYkjV+v2z1MBwag6/9X5irniDewRqdz kwyfFJsvImSw0RNoknu38tSLj7XrKzQCskto5aq9UzfWplAuj6Dv+kfb4XZ5NxgPwWEV f7G46ppas+dfHEJSb/eP375WLSxzqGkxb6cwDIV4QJ8hSf+6S8xgRJuv9fUHY65Gnztf /W4/pTO9D9QXe2ZxVIp5EztbRAGgpcS9dgwveig7Xi1Gv6N3j9REsTauwPsn+I2obpV7 ONvbbb4QJHCm8LhNV1hdVGO+JaVM/Z9RmpkDo0do9azR/UIuvPfJytNFKh54E0QD/v+N DKNQ== X-Gm-Message-State: AOAM530jALp+izyC2P1syVQGMYBXrp/T0KygaLawN8+8q7A8fW75TDfJ Dyu/Ks7eyfbioB9hlsiVQdrs5eezAxWpiArhmPl6jEeb/H2q1w== X-Google-Smtp-Source: ABdhPJzjpRgDjy2i4T//XlmFDRkY0XubE0ZgMGJUmV+kLFQ1aNESY5k7U9xkNq9dJ2QrFpFt41Pj63jAhGpp4wbkBLY= X-Received: by 2002:a05:6402:1756:b0:432:dd5f:ec38 with SMTP id v22-20020a056402175600b00432dd5fec38mr5628907edx.307.1654733354109; Wed, 08 Jun 2022 17:09:14 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:906:478b:b0:6fe:f76c:8596 with HTTP; Wed, 8 Jun 2022 17:09:12 -0700 (PDT) In-Reply-To: References: <871qvzucqh.fsf@localhost> From: Samuel Wales Date: Wed, 8 Jun 2022 17:09:12 -0700 Message-ID: Subject: Re: git branch rename and git config q To: Max Nikulin Cc: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=samologist@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 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 X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654733447; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kJAufcn24tbNp63yzLj5OOLyaVVn5Okm9Bh8GAUthGU=; b=IVCvJ1U+9PzTTdWFbRMHBg+aKFj+7PDCBWvvunxksn/5wt3cR3U0ie7A5xWM2HTyXsYpcC IeXeiwRTBjDXh7L7zprn8b0F+rMtuxHxok1R/w8/6NXYk80pAyyylCWadA+24KetFnVhDN kPAj+qkFn0YpjTQZPzUql+86xw7ZDmtcJdiv4FqRxyVfHkjmPSSLufy6CzAxI85tMMXzl6 rYVOXdTDuE61rgUmzKH41TeX8CboqXz6nmBBWo5JAAUrhINcfsQsr8vIPc0aAl/hV3B1NJ bnUN2DTpM/1U9Gl+KgAkssgXfMldo1SoqW3Tp6wnA4k0mWe6zFD/fm15WZ/TZQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654733447; a=rsa-sha256; cv=none; b=fbVUkJQVFJh+OAMH5zrphBW5iyVkgKDgv+dYZqasgNb7WahjFD0g/8tVVJYrlDrAys089Z ZFdqpHO835g3taLGU3p2Li5vs7/1ittmLPEdub4hOTaczzpI4+dpF91ifqZtBG6/4SmYE9 nXnrmwwPCEdDWAS8UiexgcN/ovVTeDDsLihXkKuN+6lLgP0VYkbvLNGe5CQ/oSp7Oz+PeR Ig7U/ZwkaZJ/ktGwYm6kYUVpZR+r/7KYBiN8cnSBnUt4k4HZf0wIMwF1K/k5OtLmPE052g x9xp6oqi3cnkem5igNbGT/6HFF+OYbziVJl3fHUMjG5E8dGyecxhXf6wKLXIqg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XzQTupab; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XzQTupab; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: AE7C8209BA X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: wqAbSoUlLb3H i /might/ have gotten it fixed. will have to confirm when can. takes me time to do things so i have drafts, but it sounds like this by max is a shortened version, so i tried it: vvv I have not tested the following commands git remote set-url origin https://git.savannah.gnu.org/git/emacs/org-mode.git git branch --set-upstream-to=bugfix local git fetch ^^^ i assume that this is an untested script for doing what i want. the fact that it is turnkey is a huge boon because my cognition and ability to use computers lmited and have consequences. looks a bit like a yes to my op q viz. can i do this? i greatly appreciate the help from all contributors in addition, even if not understand all of it or can't do parts. the upgrade to recent org might be needed for any fix to the needed org-capture extension so if this works it is good. so what i did was run those 3 commands [one does not work] and edit config manually and pull. here is a transcript plus my complete config. i will have to reproduce using my shell pull so i can get the diff. cannot do now but cp etc. i find editing the config manually more straightforward than running a command to edit it. i THINK this worked. i had to figure out a trivial guess at what to do to fix maint branch. on clean local branch. transcript: vvv 08-Wed-16-06-47 ...$ cp -a org-mode--my-maint--ok-to-pull TEST-branch-rename--org-mode--my-maint--ok-to-pull cd TEST-branch-rename--org-mode--my-maint--ok-to-pull/ 08-Wed-16-07-25 ...$ 08-Wed-16-07-25 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ 08-Wed-16-07-36 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ 08-Wed-16-07-36 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git remote set-url origin https://git.savannah.gnu.org/git/emacs/org-mode.git 08-Wed-16-07-48 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ 08-Wed-16-07-48 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git branch --set-upstream-to=bugfix local error: the requested upstream branch 'bugfix' does not exist hint: hint: If you are planning on basing your work on an upstream hint: branch that already exists at the remote, you may need to hint: run "git fetch" to retrieve it. hint: hint: If you are planning to push out a new local branch that hint: will track its remote counterpart, you may want to use hint: "git push -u" to set the upstream config as you push. (1) 08-Wed-16-07-58 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git fetch remote: Counting objects: 4972, done. remote: Compressing objects: 100% (1487/1487), done. remote: Total 4972 (delta 3897), reused 4531 (delta 3485) Receiving objects: 100% (4972/4972), 2.51 MiB | 3.19 MiB/s, done. Resolving deltas: 100% (3897/3897), completed with 310 local objects. >From https://git.savannah.gnu.org/git/emacs/org-mode * [new branch] bugfix -> origin/bugfix dd9105d17..1466950c7 emacs-sync -> origin/emacs-sync * [new branch] main -> origin/main * [new tag] release_9.5.4 -> release_9.5.4 * [new tag] release_9.5 -> release_9.5 * [new tag] release_9.5.1 -> release_9.5.1 * [new tag] release_9.5.2 -> release_9.5.2 * [new tag] release_9.5.3 -> release_9.5.3 08-Wed-16-08-59 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git branch --set-upstream-to=bugfix local error: the requested upstream branch 'bugfix' does not exist hint: hint: If you are planning on basing your work on an upstream hint: branch that already exists at the remote, you may need to hint: run "git fetch" to retrieve it. hint: hint: If you are planning to push out a new local branch that hint: will track its remote counterpart, you may want to use hint: "git push -u" to set the upstream config as you push. (1) 08-Wed-16-09-17 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git branch --set-upstream-to=bugfix local error: the requested upstream branch 'bugfix' does not exist hint: hint: If you are planning on basing your work on an upstream hint: branch that already exists at the remote, you may need to hint: run "git fetch" to retrieve it. hint: hint: If you are planning to push out a new local branch that hint: will track its remote counterpart, you may want to use hint: "git push -u" to set the upstream config as you push. (1) 08-Wed-16-11-52 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ git pull First, rewinding head to replay your work on top of it... Applying: === alpha agenda mark ring push Applying: === alpha make agenda display inactive timestamp lines with a new face Applying: === alpha location of time span annotation Applying: === alpha kludge -- put a newline when editing babel source blocks Applying: === alpha agenda -- add event, remove colons and spaces, add comment re ts feature Applying: === alpha location of possible header insertion so it can be made varibale pitch Applying: === alpha remove the parens from ido completion of olpaths Applying: === alpha comment and change active ts = event change Applying: === alpha =maybe try to move nokori to today or move by days, not just one 08-Wed-16-12-03 .../TEST-branch-rename--org-mode--my-maint--ok-to-pull$ ^^^ notice that it rebased my patches all by itself. [at least this time.] not sure if dangerous my case; wfm; i do not push. i do not get what gets dangerously rewritten. my patches get merge conflicts. org patches are presumably not rewritten. merge conflicts instill rational fear but that is not avoidable here. and did not even occur for such a huge upgrade. uf you are curious about my patches please ask. some are mere guesses at locations to do things that i am ot capable of. some are ueful tiny changes. not fsf signed. have contributed tinychanes. config: [after manual editing] vvv [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true ignorecase = true [remote "origin"] # https://code.orgmode.org https://savannah.nongnu.org https://sr.ht url = https://git.savannah.gnu.org/git/emacs/org-mode.git # url = git://orgmode.org/org-mode.git #cz is 1h behind orgmode.org -- either should work # url = git://repo.or.cz/org-mode.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master [branch "local"] rebase = true remote = origin merge = refs/heads/bugfix # merge = refs/heads/master [branch "testrelease"] # fixme idk why i have this branch and can maybe del it remote = origin merge = refs/heads/maint [branch "maint"] remote = origin merge = refs/heads/maint [diff] ^^^ -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com