From owner-freebsd-git@freebsd.org Tue Jan 26 20:51:49 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C3DB04E015B for ; Tue, 26 Jan 2021 20:51:49 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic311-24.consmr.mail.gq1.yahoo.com (sonic311-24.consmr.mail.gq1.yahoo.com [98.137.65.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQJnJ5Rgzz4T1v for ; Tue, 26 Jan 2021 20:51:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1611694307; bh=SLBNQKEqUZqsCMpJkNpKb2MEXrZvt8Blfs+8gT+OjX1=; h=From:Subject:Date:To:From:Subject:Reply-To; b=sVpLJtEoolWOqFAlKrtR4VG+dmpMLfJxxZKeR3RHZ9jl1cKWgHrLU1LYUKYEo1oqhu4SjResQ8JR80UIq7BSEXoFZIJ2DOPmA5b56180a/yDpNWaeBduRbVggN46m6Ky/wQolkps+mAqJmY+bfXorcHStbcJQoqh028WpwJ0j8+wkHnMTm+piRJSIBQLOeh/upssqxo8niVfjEzOrVNFr59nhmkFVqjTD5gARA33CXOafhhIO2tah6CgklFdCEEOnKb9XIn//qORuCB2YyAh6x6XLInfTSVxvt925u21DPmwdGxlQU6z97OlA5Rv32n+KDmNgQwJt1eadX8zDV0SJQ== X-YMail-OSG: 1JU.NJIVM1n6RiAb0QbINuBsh346oXerPoPizbfvQxdOpbYNRN16YkqVSoowNN3 EEURaudejSdX6j6CmagC2WhNXd9mum5IxfHbAA7r.6NIBVZtrgzvZlWDe2_t7ebRQBlil4x7uKuT aPIL5GOklXqcDJVmiQNpVnbYxqdO1uy9H4P_rzuysYvWX2ggSP.agPOFO5CoWRp4r9ohmXpGiuXd cmDk3j7yUVvzn5hCqkD68p70EpBX6MhhzL5NOAT5oeBV1e0bAFgV8g25Hb0jyAtyF6A3CNnOkZz5 n5sAweZUU5k6woQHlTp5EXKDW3QPr37XyO4UKCu3gCgJZaTWKkUapQPt_qqDF9gGjjN2D7.CEfAN 8Lg_C.5ptKfZEI4NYl_Ei1CT6Ybcu3PsRGZGi1Clf_AWwiO43omiPwpPecZfCsxYYQeMRD1UeyaZ UnhBi9vEzukmBTlv7rqGCGBqKRUyNNZlXkzuTCPdKhMPJwKOE1DXfw7t76Vy2YCxNrKYxRNfbAK7 Sb6kbpVDefddunHyrjxrX17wYioOPkXY4.5Vi3q6Dt54sfSJzNoQDxXZZHj5bto33ajW7sfJL53e vM0v4qDRVYpSDUEiFPwNjB8lUqo5si1K.z4HKuj2QhzcF3FjXQla8iL3Lb6CIh9F7TpyfYJNuxFW kfhoYfKoAEW7_x8kSG4q0pXHlKHdzdizO658TLlAW.n1PRgg2QvMkXO5RG3aUNHc_kkHFg374bdO RCN9_ABPaUOalXqM1Jq7yYuMnmB9tKhr5o_e.nZktfflEyGkQXrZyM4uoGs_UBPjwv1iMMiDgHbV uIm62Ga9LI35TRIIRTl4yCTZ9khVUslGflCF8z5cY.zWSbmDfFqRQmfeWLj8ClTdXBXuO2ndqINT triv_JLdzdTtZVmEbZK41SvHHy5nEtjId3xpqUzleXwiaJAxaVkHma5yQB1HrUweDRNdKWbZ6Hr2 nHGK2Bfk1m.B3f8XkevPidY7Rb6LXrZMXA6R7yNaTxie.LU6rtiy73jUwciEvrSZzZBft5IZJVEg 2KX8PIC74gMRrvs6rllpgBLXyLt5MPny7NBpGcQ1bjp6nOx0U1f9OpNkADWIKjxxybVaFR_yIZcM xws2kuY3KJMhrSPgv._MDMXxTWfSUjG7mh8KUrLdtZ8co.MSXE8V2nRyI1TFNdzHn7lJ6nepDF87 w2oG_c78dQezbgMdY.XwK.sTyd9wMZ0mI99eGP9aMWpPdCitfoId3XMzM9zLuO1KNl.p4FVV.yvT uxvHVJ69PoEhvwMkTKstkC6WaBTARx1y.UgwVpwzwNpekSSQhAncXswO9nVkiJIITH.JNKVg527z avHyQaHNbdC22yjFODDVR4XFKPUCC5FUY88qG.7i_YV.yLkKl4H_q0qXx2L59rC0I1LoGSpDbVrc diPLXVcdYsmefBI6jVSJAtBvXQD2LWdGiyzALSTFjmlIYmmFSd_HqArcFz3iR0SMJ4q5s53DdeYw By1..B9VFFQzsIOeOnDA4s7ExIDIIheMypLpJUnuVh8d98mMfq9Rbt1CRaL2_g49q58o2rBxq0lk VqnKBKHSs6IVMg40jRquwnYsgXfxl9E16yz1HUIkKxwfB7bg.Bi1JNadtw3HuXmY2DKs3FQaC33E vDmet3aWr9H7IzzST6Vb76hFH5vMFb8FXzck_JUdTsuLE8plIh815HWcmCmVPKTNRo.5lMlE3hri 5rikiHocJkTr11qdA0gN0J0E5BM46ZSnc1687cHZ46OpBHhR8szRGtDrW5hcbtML3GH_j48_aKxB mMhQcg_yhFakY3rYts3qqdLN3q7YHWA0iv00Br_edjMOXAC1a2kYCYiZKFCrquZoKupWBzI301Dy 3e3IhZIxYYXYNHjnULjFFZ9sNFJMzEB16f2P8RWL6ywHgRC1eL5y4CN3IIKZdyeK2DRYKDuUIEZF F6SzIz7cfljjt8P6IkChIUmQQzDCqeiA0aIGy3eJVPIMTvHCPA9t7fc80Tzx1YE5N7BU2U9HElUm sGrxx5hOkQMFmSy7pjjY6WkGCZ8vbdDVBufC7ZaKPt_pZvXXMrDN5WGP78mBXKjNYcuNsDBKDlkx xZTjr04AL2fivNam75OdGGRNdhvRCu3LXGBiADaHhl1i1R5lNNb5sAze9PU_cmInGsROyfVMDGSs EiXsBlPCoZ2muUvihpt2xgVPOjHtzd9gBuPfUjqfoR5kA1OzI7_CZOQesdNs58bbzR6OGkCtBuWC xWNq2ifJ0aKtYzI5vrr4ObBn9RreLMbrFJU7INQWf1JpKu9uU7BRNMh7e3HCRdd.8mrU0MmE4a9v i0rYHoOF8_1nRy7Lkw32FQNdlrc7hWFOAsZwdhJOPOcUcDqblPff44FP3bAy_k1nL.k2CUhaB_vk ljdAtU.Tj8_qPUoia6kuKTIRWeAP_9e0h6Vybp.qkai1emU.qXqYqLRdqaNezX5ZkUPuDC.yX2nl _wP3uRuBCksX3h2uR48m8FmDFgQ-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.gq1.yahoo.com with HTTP; Tue, 26 Jan 2021 20:51:47 +0000 Received: by smtp406.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 82691bb15afd5b5d594f6860e00b1323; Tue, 26 Jan 2021 20:51:45 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: git setup/usage question Message-Id: Date: Tue, 26 Jan 2021 12:51:43 -0800 To: freebsd-git@dino.sk, freebsd-git X-Mailer: Apple Mail (2.3654.40.0.2.32) References: X-Rspamd-Queue-Id: 4DQJnJ5Rgzz4T1v X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.65.205:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.65.205:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.205:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.205:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2021 20:51:49 -0000 Milan Obuch freebsd-git at dino.sk wrote on Tue Jan 26 14:10:29 UTC 2021 : > # git clone --config remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*'= --bare https://git.freebsd.org/src.git > /mnt/src/.git > # git -C /mnt/src/.git worktree add /mnt/src/main main > # git -C /mnt/src/.git worktree add /mnt/src/13 stable/13 > # git -C /mnt/src/.git worktree add /mnt/src/12 stable/12 > # git -C /mnt/src/.git worktree add /mnt/src/11 stable/11 . . . > # git -C /mnt/src/.git merge > fatal: this operation must be run in a work tree >=20 > I am a bit stuck now. What does it mean 'being in a work tree'? Doing > 'cd /mnt/src/main' or similar before git command does not change > anything. I read 'man git-merge' but still no clue. It must be > something simple, I just do not see it. man git reports: -C Run as if git was started in instead of the current = working directory. . . . So it looks to me like you need to do one or more of something like: # git -C /mnt/src/main merge # git -C /mnt/src/stable/13 merge # git -C /mnt/src/stable/12 merge # git -C /mnt/src/stable/11 merge /mnt/src/.git is not a working directory. Note that # git -C /mnt/src/.git log has the same sort of issue. The other commands that you list (clone, worktree add, worktree list, fetch) do not depend on having some specific, pre-existing worktree (working directory) as context for those operations. For those, referencing the .git directory tree works. /mnt/src/main , /mnt/src/stable/13 , /mnt/src/stable/12 , and /mnt/src/stable/11 all include information pointing to /mnt/src/.git as what they are tied to. So they tend to also work where /mnt/src/.git references are okay. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)