From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jude DaShiell <jdashiel@shellworld.net>
Subject: Re: getorg.sh script
Date: Thu, 28 Jul 2011 17:34:43 -0400 (EDT)
Message-ID: <alpine.BSF.2.00.1107281732100.12506@freire1.furyyjbeyq.arg>
References: <alpine.BSF.2.00.1107280550530.88255@freire1.furyyjbeyq.arg>
	<87ipqm33i8.fsf@norang.ca>
Mime-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:51455)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jdashiel@shellworld.net>) id 1QmYE9-0001Zx-Gr
	for emacs-orgmode@gnu.org; Thu, 28 Jul 2011 17:34:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jdashiel@shellworld.net>) id 1QmYE8-00038q-FE
	for emacs-orgmode@gnu.org; Thu, 28 Jul 2011 17:34:45 -0400
Received: from shellworld.net ([69.60.117.94]:56079
	helo=server1.shellworld.net) by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jdashiel@shellworld.net>) id 1QmYE8-00038c-96
	for emacs-orgmode@gnu.org; Thu, 28 Jul 2011 17:34:44 -0400
In-Reply-To: <87ipqm33i8.fsf@norang.ca>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Bernt Hansen <bernt@norang.ca>
Cc: emacs-orgmode@gnu.org

Whenever I apply a patch to the Makefile an orgmode update fails since 
my local changes have to be stashed or commited according to git.  It's 
the merge step that fails.

I probably know less about git than I ought to, but that's what's 
happened over here.

On Thu, 28 Jul 2011, Bernt Hansen wrote:

> Jude DaShiell <jdashiel@shellworld.net> writes:
> 
> > These days I use this when an org-mode update fails and I have to erase 
> > the whole org-mode directory tree and clone org-mode again.  
> > Cut here.
> >
> > #!/bin/bash
> > #file getorg.sh - run git to update local org repository.
> > if [ -r ~/org-mode  ]; then
> > echo "updating emacs-org-mode"
> > cd org-mode
> > git pull
> > make all
> > sudo make install
> > sudo make install-info
> > exit 0
> > fi
> > echo "getting new clone of emacs-org-mode"
> > mkdir org-mode
> > cd ~/org-mode
> > git clone git://orgmode.org/org-mode.git
> > make all
> > sudo make install
> > sudo make install-info
> >
> > cut here.
> > I learned some additional bash shell technique as a result of having 
> > written this script so am happy to have done it and gained the experience.
> 
> Hi Jude,
> 
> In what situations does org-mode update fail?  I've never had to reclone
> the org-mode repository - ever.  If git update fails, just do it again.
> Recloning means you need to download all of the objects for org-mode
> again which should never be necessary.
> 
> If you've messed up your local master branch somehow and want to revert
> back to the official 'master' branch then just
> 
> $ git checkout master
> $ git reset --hard origin/master
> 
> which throws away any local commits and uncommitted changes in your
> working directory.
> 
> I fail to understand why you would ever need this script.  Can you
> please elaborate?
> 
> Thanks,
> Bernt
> 
>