From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Philip Oakley" Subject: Re: erratic behavior commit --allow-empty Date: Thu, 4 Oct 2012 23:42:49 +0100 Organization: OPDS Message-ID: <74938A94D25C4F1887F30C281A02B35F@PhilipOakley> References: <506AA51E.9010209@viscovery.net><7vzk449449.fsf@alter.siamese.dyndns.org><7vhaqc7in6.fsf@alter.siamese.dyndns.org><90464C79DA97415C9D66846A77ECAA4A@PhilipOakley><20C3105FC8D94F749FAEB7444325B34A@Phil ipOakley> Reply-To: "Philip Oakley" Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=original Content-Transfer-Encoding: 7bit Cc: "Junio C Hamano" , "Johannes Sixt" , "git" , "Matthieu Moy" To: "Angelo Borsotti" X-From: git-owner@vger.kernel.org Fri Oct 05 01:16:55 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TJu7u-0000BA-Ov for gcvg-git-2@plane.gmane.org; Fri, 05 Oct 2012 00:42:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755215Ab2JDWmc (ORCPT ); Thu, 4 Oct 2012 18:42:32 -0400 Received: from out1.ip01ir2.opaltelecom.net ([62.24.128.237]:57680 "EHLO out1.ip01ir2.opaltelecom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755203Ab2JDWmc (ORCPT ); Thu, 4 Oct 2012 18:42:32 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AhIKAOkBblBcGnKf/2dsb2JhbABFi06yPAOBCIEJghsFAQEFCAEBLh4BASELAgMFAgEDFQELJRQBBAgSBgcXBhMIAgECAwEKh1gDE65RDYlUilpkbAKET2ADiCOFRoYrjHaFC4Ju X-IronPort-AV: E=Sophos;i="4.80,537,1344207600"; d="scan'208";a="405707357" Received: from host-92-26-114-159.as13285.net (HELO PhilipOakley) ([92.26.114.159]) by out1.ip01ir2.opaltelecom.net with SMTP; 04 Oct 2012 23:42:30 +0100 X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.5931 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: "Angelo Borsotti" Sent: Thursday, October 04, 2012 11:09 PM >> >> A reasonable solution. You can also create a sentinel (--root) commit >> for >> any time that you need to create the source branch, just so it (the >> real >> source code commit) has a different parent when on source branch to >> that on >> the binaries branch. > > Do you mean I could create an empty root commit to be used as parent > for the > real source commit? Or that there is some --root option to be used? I was using "--root" in a colloquial way. It is used in some other commands when the very first commit is to be included in its operation. At the point where you do the 'git checkout --orphan ' you could have separate start points ready for the source branch and the binaries branch, and immediately do a 'git commit' to create the unique sentinel commit before you re-checkout the developers latest and greatest (with --force), and then do your commits on the source branch as before. Another technique could be to simply switch to the sources branch, and then use a 'git clean -x' with an updated .gitignore ('reset' the file from the source branch)[or use the exclude file] to remove those now ignored binaries, before doing the commit. Philip