From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2 autolearn=ham autolearn_force=no version=3.4.4 Received: from txout-a4-smtp.messagingengine.com (txout-a4-smtp.messagingengine.com [103.168.172.227]) by inbox.vuxu.org (Postfix) with ESMTP id 9EFE420CFA for ; Sun, 12 Jan 2025 22:58:18 +0100 (CET) Received: from localhost.localdomain (kubehost02.phl.internal [10.202.3.2]) by mailtxout.phl.internal (Postfix) with ESMTP id 5A261238025E for ; Sun, 12 Jan 2025 16:58:17 -0500 (EST) ARC-Authentication-Results: i=2; topicbox.com; arc=pass; dkim=invalid (public key: not available, unknown key sha256) header.d=pixelhero.dev header.i=@pixelhero.dev header.b=BPUJlnX/ header.a=unknown-sha256 header.s=key1; dmarc=none policy.published-domain-policy=none policy.applied-disposition=none policy.evaluated-disposition=none (p=none,d=none,d.eval=none) policy.policy-from=p header.from=pixelhero.dev; spf=pass smtp.mailfrom=noam@pixelhero.dev smtp.helo=out-188.mta0.migadu.com; x-internal-arc=fail (as.1.topicbox.com=pass, ams.1.topicbox.com=fail (body has been altered)) (Message modified while forwarding at Topicbox) ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d= topicbox.com; h=mime-version:content-transfer-encoding :content-type:date:message-id:to:subject:from:references :in-reply-to:list-help:list-id:list-post:list-subscribe:reply-to :list-unsubscribe; s=sysmsg-1; t=1736719097; bh=5HW6dg2aR3K3ULyA yL374uJ1rucdnJ61+rg0OEXfjH0=; b=hi1ZHYdpWH0uu4prYlG08jENZpG47KLz 865/iND9+2ps2Ixz1ZYqPDOvBacV4AodeiZN9kAgbEZhVH42v52c4hlcVsvNGudf dq8rduwjUNwwbCRfcqQRwb5d+pEcGYa0J9LK3LPik6kqKZkdW0eapMcSs3PEJEDD v/MccLermWk= ARC-Seal: i=2; a=rsa-sha256; cv=pass; d=topicbox.com; s=sysmsg-1; t= 1736719097; b=q75L35Z6QXjoZIyqHvxGgA7ZeqzFtXPFWnk6L3nDVClD/VWfsF V0OdNdbd6sU8frf7JUdb10LIFtHc7EQCsqWS8bocC0qhAQ343GYkpsrrsJ3xeXE5 iVse/c4JJDlWlfym0cZOoyfGPcPWYh41IKE6qC3JHjyJMfstoNyOXLY3s= Authentication-Results: topicbox.com; arc=pass; dkim=invalid (public key: not available, unknown key sha256) header.d=pixelhero.dev header.i=@pixelhero.dev header.b=BPUJlnX/ header.a=unknown-sha256 header.s=key1; dmarc=none policy.published-domain-policy=none policy.applied-disposition=none policy.evaluated-disposition=none (p=none,d=none,d.eval=none) policy.policy-from=p header.from=pixelhero.dev; spf=pass smtp.mailfrom=noam@pixelhero.dev smtp.helo=out-188.mta0.migadu.com; x-internal-arc=fail (as.1.topicbox.com=pass, ams.1.topicbox.com=fail (body has been altered)) (Message modified while forwarding at Topicbox) X-Received-Authentication-Results: mx.topicbox.com; arc=none (no signatures found); bimi=skipped (DMARC did not pass); dkim=invalid (public key: not available, unknown key sha256) header.d=pixelhero.dev header.i=@pixelhero.dev header.b=BPUJlnX/ header.a=unknown-sha256 header.s=key1; dmarc=none policy.published-domain-policy=none policy.applied-disposition=none policy.evaluated-disposition=none (p=none,d=none,d.eval=none) policy.policy-from=p header.from=pixelhero.dev; iprev=pass smtp.remote-ip=91.218.175.188 (out-188.mta0.migadu.com); spf=pass smtp.mailfrom=noam@pixelhero.dev smtp.helo=out-188.mta0.migadu.com; x-aligned-from=pass (Address match); x-me-sender=none; x-ptr=pass smtp.helo=out-188.mta0.migadu.com policy.ptr=out-188.mta0.migadu.com; x-return-mx=pass header.domain=pixelhero.dev policy.is_org=yes (MX Records found: aspmx1.migadu.com,aspmx2.migadu.com); x-return-mx=pass smtp.domain=pixelhero.dev policy.is_org=yes (MX Records found: aspmx1.migadu.com,aspmx2.migadu.com); x-tls=pass smtp.version=TLSv1.3 smtp.cipher=TLS_AES_256_GCM_SHA384 smtp.bits=256/256; x-vs=clean score=0 state=0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=9fans.net; h= mime-version:content-transfer-encoding:content-type:date :message-id:to:subject:from:references:in-reply-to:list-help :list-id:list-post:list-subscribe:reply-to:list-unsubscribe; s= dkim-1; t=1736719097; x=1736805497; bh=5HW6dg2aR3K3ULyAyL374uJ1r ucdnJ61+rg0OEXfjH0=; b=HZGSeIRwA2v1C2Z/hu14LXup6GMBUUhFPFyOtuZyi TrCPlMtPTAta/fbQ2v9tGUKAe0twumcNi+F65aziyDR3OKho20KstdaHwfuW1ivl CTLgmVaG5jnvH78QM8qnn7N4nszlQ987YG3P8G8/IUCS7ueppf3FmNGDzNlFR1vj Y4= Received: from mx.topicbox.com (10-0-2-160.authmilter.topicbox.svc.cluster.local [10.0.2.160]) by tb-mx-3.topicbox.com (Postfix) with ESMTP id 8B7E71003124B648 for <9fans@9fans.net>; Sun, 12 Jan 2025 16:57:01 -0500 (EST) Received: from tb-mx-0.topicbox.com (10.0.3.136 [10.0.3.136]) by mx.topicbox.com (Authentication Milter) with ESMTP id CF21EE051B9; Sun, 12 Jan 2025 16:57:01 -0500 ARC-Seal: i=1; a=rsa-sha256; cv=none; d=topicbox.com; s=arcseal; t= 1736719021; b=fgsZW2yhzc4k/PQiFt4XsgMojwXLI0DW02klVqEFL9Zd6LPgyu d1xJQ+ofb2fwIAbfsyrLRQXnvIqrbpQ+xge5uTfjYugUdB/DflA3Ekt+oRNEU22t pf3YCrJNpA86N0hMADAYyXkT1XwXwJOo21RTlOW3/FLFDChwuguBofV5i1/NmSer R+ChmtSjJqFMmyWJNXK189XJdPWx3Z3Mstpvxp+nBOGE+Oq2wDUCrpLs1uJwgXz+ UYEBNmUI7tIrG2Ngm8ZXUcVRUYxAxheqUDfyfOEAPImjZlGaZXl74fnuTMaQb0jp +GTU8Ypio/jh3ROL74V4XvRnZFxxQA9ooofw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= topicbox.com; h=mime-version:content-transfer-encoding :content-type:date:message-id:to:subject:from:references :in-reply-to; s=arcseal; t=1736719021; bh=OVWPzpAtiBB9EdoZbkJzXr hAL5+WdEOwLySn5nFdg58=; b=A9bf23tfL3gfpJ6O6SFugyTQRSGjFE9YALT6Ii ciXGsZxETuB30qM6VaOkpUOJkH3irgZzegQhtTnk1Ep6edbed1Dcltr6cMAxlBUI eE3tDcB+gIBjNwKn1qolvTxCHpj2HrRxoZ0cnUX29jolxWZg6DMYsYFqqecgoQXT XJknMzjam6CmeRwlFz58OnLuG1rtu5zc9/+eZSRn3rNZx2Up0ejhBgfcFcRYGwB8 tAF6tIvHUzBzEhS1NsXx2+pySLrMOOWpeZAJvHlChaQZolpU3Eu9fdLqXIMBhKcv 2S/Sg84liacvc5vl88fiU5lutzk83g60g6bhaeCKrisPIVig== ARC-Authentication-Results: i=1; mx.topicbox.com; arc=none (no signatures found); bimi=skipped (DMARC did not pass); dkim=invalid (public key: not available, unknown key sha256) header.d=pixelhero.dev header.i=@pixelhero.dev header.b=BPUJlnX/ header.a=unknown-sha256 header.s=key1; dmarc=none policy.published-domain-policy=none policy.applied-disposition=none policy.evaluated-disposition=none (p=none,d=none,d.eval=none) policy.policy-from=p header.from=pixelhero.dev; iprev=pass smtp.remote-ip=91.218.175.188 (out-188.mta0.migadu.com); spf=pass smtp.mailfrom=noam@pixelhero.dev smtp.helo=out-188.mta0.migadu.com; x-aligned-from=pass (Address match); x-me-sender=none; x-ptr=pass smtp.helo=out-188.mta0.migadu.com policy.ptr=out-188.mta0.migadu.com; x-return-mx=pass header.domain=pixelhero.dev policy.is_org=yes (MX Records found: aspmx1.migadu.com,aspmx2.migadu.com); x-return-mx=pass smtp.domain=pixelhero.dev policy.is_org=yes (MX Records found: aspmx1.migadu.com,aspmx2.migadu.com); x-tls=pass smtp.version=TLSv1.3 smtp.cipher=TLS_AES_256_GCM_SHA384 smtp.bits=256/256; x-vs=clean score=0 state=0 X-ME-VSCause: gggruggvucftvghtrhhoucdtuddrgeefuddrudehvddgudehgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhepggfgtg ffkffvuffhfhgjsehtqhertddttdejnecuhfhrohhmpedfpfhorghmucfrrhgvihhlfdcu oehnohgrmhesphhigigvlhhhvghrohdruggvvheqnecuggftrfgrthhtvghrnhepgfdvge ehtdejvdejffetfeeivefhffejgffhfffgfffhfeekjeduvdetkeehfeejnecukfhppeel uddrvddukedrudejhedrudekkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epihhnvghtpeeluddrvddukedrudejhedrudekkedphhgvlhhopehouhhtqddukeekrdhm thgrtddrmhhighgrughurdgtohhmpdhmrghilhhfrhhomhepoehnohgrmhesphhigigvlh hhvghrohdruggvvheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepoeelfhgrnhhs seelfhgrnhhsrdhnvghtqe X-ME-VSScore: 0 X-ME-VSCategory: clean Received-SPF: pass (pixelhero.dev: Sender is authorized to use 'noam@pixelhero.dev' in 'mfrom' identity (mechanism 'include:spf.migadu.com' matched)) receiver=mx.topicbox.com; identity=mailfrom; envelope-from="noam@pixelhero.dev"; helo=out-188.mta0.migadu.com; client-ip=91.218.175.188 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by tb-mx-0.topicbox.com (Postfix) with ESMTPS for <9fans@9fans.net>; Sun, 12 Jan 2025 16:57:00 -0500 (EST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sun, 12 Jan 2025 15:55:53 -0600 Message-Id: To: "9fans" <9fans@9fans.net> Subject: Re: [9fans] Re: Git usage X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "Noam Preil" References: In-Reply-To: X-Migadu-Flow: FLOW_OUT Topicbox-Policy-Reasoning: moderate: sender is a member; group holds all messages Topicbox-Message-UUID: 28312bc4-d130-11ef-8004-e3ef633c1ef0 Archived-At: =?UTF-8?B?PGh0dHBzOi8vOWZhbnMudG9waWNib3guY29tL2dyb3Vwcy85?= =?UTF-8?B?ZmFucy9UYzMwOTQ0NTAyOTU4ZTFhMC1NZjFhYjAxZWJjZGVkZTgxNWNkYjhh?= =?UTF-8?B?YmE1Pg==?= List-Help: List-Id: "9fans" <9fans.9fans.net> List-Post: List-Software: Topicbox v0 List-Subscribe: Precedence: list Reply-To: 9fans <9fans@9fans.net> List-Unsubscribe: , Topicbox-Delivery-ID: 2:9fans:437d30aa-c441-11e9-8a57-d036212d11b0:522be890-2105-11eb-b15e-8d699134e1fa:Mf1ab01ebcdede815cdb8aba5:1:65qcN3-_Pp-pJDpP5JSGg0WvSvpFcBAinWni3lPQ4yg git/merge might work a bit faster, but making it smarter was on the list of things I wanted to get to right before my 9front laptop broke :P Both merge and rebase, IIRC, will try comparing every path on either side (or all three sides for 3-way merges, rather), even if e.g. the parent directory doesn't exist. So if you do e.g. % mkdir /tmp/foo % cd /tmp/foo % git/init % touch foo % git/add foo % git/commit -m 'initial commit' foo % git/branch -nb front tmp # Copy the entire Go tree in here % clone -v /tmp/go/* . % git/add go % git/commit -m 'add go' go % git/branch front Any merge you do between these two branchs will check EVERY PATH IN THE GO TREE, even though go only exists on one side. What we basically need is for diff3 or merge to take in the roots, and walk the tree intelligently, writing off entire directories rather than attempting every child. ------------------------------------------ 9fans: 9fans Permalink: https://9fans.topicbox.com/groups/9fans/Tc30944502958e1a0-Mf1ab0= 1ebcdede815cdb8aba5 Delivery options: https://9fans.topicbox.com/groups/9fans/subscription