From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Sat, 22 Nov 2014 07:42:04 +0000 Message-ID: <87fvdbwuk3.fsf@violet.siamics.net> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> <87ppchd9dk.fsf@Gertrud.fritz.box> <83fvdd612c.fsf@gnu.org> <87h9xttmwa.fsf@uwakimon.sk.tsukuba.ac.jp> <83oas13p1y.fsf@gnu.org> <87egsvu7iw.fsf@uwakimon.sk.tsukuba.ac.jp> <87k32nwwxg.fsf@violet.siamics.net> <871tovu268.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1416642202 23924 80.91.229.3 (22 Nov 2014 07:43:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 07:43:22 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 08:43:18 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xs5Lh-0005pv-EN for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 08:43:17 +0100 Original-Received: from localhost ([::1]:44292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs5Lg-0005gl-W0 for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 02:43:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs5Le-0005ge-5V for emacs-devel@gnu.org; Sat, 22 Nov 2014 02:43:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs5Lc-0006hS-VH for emacs-devel@gnu.org; Sat, 22 Nov 2014 02:43:14 -0500 Original-Received: from fely.am-1.org ([2a01:4f8:d15:1b86::2]:48041) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs5La-0006WB-3s for emacs-devel@gnu.org; Sat, 22 Nov 2014 02:43:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:Sender:References:Subject:To:From; bh=j/YioqeAp99pEVGl/coSuARbDP/lhjDnQ9OzDs9PhYg=; b=sDV/fe8R1eF4HjlYgNARqgGwrR32IaPTVJGL8DMvv1CYvrb62LnsjIUO/+jNRx/u8xRx0/cKFso7E+1wmvw8Ef1tXpSX730PsqYp6YbP3uvRKSKRA4M136AivjyVpBza5DR/wkQQ/PuwNXXoD7w+QTiNSqLV0C20SyHJ4PIVylY=; Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xs5Ki-0000i9-96 for emacs-devel@gnu.org; Sat, 22 Nov 2014 07:42:16 +0000 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xs5KX-0000rY-FF for emacs-devel@gnu.org; Sat, 22 Nov 2014 14:42:05 +0700 In-Reply-To: <871tovu268.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Sat, 22 Nov 2014 16:25:51 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:d15:1b86::2 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177972 Archived-At: >>>>> Stephen J Turnbull writes: >>>>> Ivan Shmakov writes: [=E2=80=A6] >> Not necessarily, =E2=80=93 you can just as well add the Git (or, rather, >> .git/objects) directory of your =E2=80=9Cother=E2=80=9D clone to your c= urrent=E2=80=99s >> .git/objects/info/alternates, which will make the other clone=E2=80=99s >> commits available for any operation =E2=80=93 including merge =E2=80=93= on the >> current one. > OK, it's possible to avoid the copy/linking operations of fetch, but > you still need to do the merge in the current repo My understanding was that it was the intent. > (and typically pull the ref from the other repo). Refs are just human-readable aliases to the commit identifiers. It=E2=80=99s perfectly possible to merge in a branch using the latter. > There are also reasons why using alternates is not necessarily great > (especially for new users) -- eg, it means that rebase, commit > --amend, filter-branch, and so on can corrupt the dependent repo. Only if the objects comprising the original commit get deleted in the process; I=E2=80=99m unsure on what are the conditions to that. Otherwise, the objects are immutable, and the likes of --amend just create a brand new commit based on the given one; the latter being left intact. [=E2=80=A6] --=20 FSF associate member #7257 http://boycottsystemd.org/ =E2=80=A6 3013 B6A0= 230E 334A