From: Jude DaShiell <jdashiel@shellworld.net>
To: Bernt Hansen <bernt@norang.ca>
Cc: emacs-orgmode@gnu.org
Subject: Re: getorg.sh script
Date: Thu, 28 Jul 2011 17:34:43 -0400 (EDT) [thread overview]
Message-ID: <alpine.BSF.2.00.1107281732100.12506@freire1.furyyjbeyq.arg> (raw)
In-Reply-To: <87ipqm33i8.fsf@norang.ca>
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
>
>
next prev parent reply other threads:[~2011-07-28 21:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 9:56 getorg.sh script Jude DaShiell
2011-07-28 14:04 ` Bernt Hansen
2011-07-28 21:34 ` Jude DaShiell [this message]
2011-07-28 21:39 ` Bernt Hansen
2011-07-28 21:50 ` suvayu ali
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.BSF.2.00.1107281732100.12506@freire1.furyyjbeyq.arg \
--to=jdashiel@shellworld.net \
--cc=bernt@norang.ca \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).