From: Ingo Molnar <mingo@elte.hu>
To: Petr Baudis <pasky@ucw.cz>
Cc: Martin Schlemmer <azarah@nosferatu.za.org>,
David Greaves <david@dgreaves.com>,
dwheeler@dwheeler.com, Daniel Barkalow <barkalow@iabervon.org>,
git@vger.kernel.org
Subject: Re: Change "pull" to _only_ download, and "git update"=pull+merge?
Date: Wed, 20 Apr 2005 09:01:57 +0200 [thread overview]
Message-ID: <20050420070157.GA12584@elte.hu> (raw)
In-Reply-To: <20050419105008.GB12757@pasky.ji.cz>
* Petr Baudis <pasky@ucw.cz> wrote:
> > I think pull is pull. If you are doing lots of local stuff and do not
> > want it overwritten, it should have been in a forked branch.
>
> I disagree. This already forces you to have two branches (one to pull
> from to get the data, mirroring the remote branch, one for your real
> work) uselessly and needlessly.
>
> I think there is just no good name for what pull is doing now, and
> update seems like a great name for what pull-and-merge really is. Pull
> really is pull - it _pulls_ the data, while update also updates the
> given tree. No surprises.
yeah. In fact most of the times i did 'git pull pasky' in the past, the
'merge' phase was unsuccessful, and i had to nuke the tree and recreate
it. All i did with the snapshots was to build them, so there were no
local changes. Waiting a couple of days with doing a 'git pull pasky',
or installing Linus' tree is a sure way to break the merging.
e.g. to reproduce the last such failure i had today, do:
cd git-pasky-base
echo 8568e1a88c086d1b72b0e84ab24fa6888b5861b9 > .git/HEAD
read-tree $(tree-id $(cat .git/HEAD))
checkout-cache -a -f
make
make install # make sure to use the older tools
rm -rf .git/objects
git pull pasky
and i get:
[...]
fatal: unable to execute 'gitmerge-file.sh'
fatal: merge program failed
Conflicts during merge. Do git commit after resolving them.
note that with earlier versions of pasky, i had other merge conflicts.
Sometimes there were .rej files, sometimes some sort of script failure.
So it seems rather unrobust at the moment. Especially if i happen to
install Linus' tree and try to sync the pasky tree with those tools.
another thing: it's confusing that during 'git pull', the rsync output
is not visible. Especially during large rsyncs, it would be nice to see
some progress. So i usually use a raw rsync not 'git pull', due to this.
yet another thing: what is the canonical 'pasky way' of simply nuking
the current files and checking out the latest tree (according to
.git/HEAD). Right now i'm using a script to:
read-tree $(tree-id $(cat .git/HEAD))
checkout-cache -a
(i first do an 'rm -f *' in the working directory)
i guess there's an existing command for this already?
Ingo
next prev parent reply other threads:[~2005-04-20 6:58 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-16 1:56 [PATCH] Add "clone" support to lntree Daniel Barkalow
2005-04-16 2:47 ` Petr Baudis
2005-04-16 2:58 ` Petr Baudis
2005-04-16 3:16 ` Linus Torvalds
2005-04-16 11:39 ` Petr Baudis
2005-04-16 3:17 ` Daniel Barkalow
2005-04-16 23:33 ` Petr Baudis
2005-04-17 0:07 ` Daniel Barkalow
2005-04-19 1:12 ` Petr Baudis
2005-04-19 2:13 ` Change "pull" to _only_ download, and "git update"=pull+merge? David A. Wheeler
2005-04-19 9:18 ` David Greaves
2005-04-19 9:28 ` Petr Baudis
2005-04-19 10:05 ` Martin Schlemmer
2005-04-19 10:50 ` Petr Baudis
2005-04-19 13:54 ` Jon Seymour
2005-04-19 14:40 ` Martin Schlemmer
2005-04-19 18:28 ` Daniel Barkalow
2005-04-19 22:39 ` David A. Wheeler
2005-04-19 23:20 ` Daniel Barkalow
2005-04-20 7:01 ` Ingo Molnar [this message]
2005-04-20 20:05 ` Petr Baudis
2005-04-20 20:32 ` Ingo Molnar
2005-04-20 20:45 ` Ingo Molnar
2005-04-20 21:15 ` Petr Baudis
2005-04-20 23:58 ` David Mansfield
2005-04-16 3:06 ` Add "clone" support to lntree Daniel Barkalow
2005-04-16 23:00 ` Petr Baudis
2005-04-16 23:07 ` Daniel Barkalow
2005-04-16 23:44 ` Petr Baudis
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050420070157.GA12584@elte.hu \
--to=mingo@elte.hu \
--cc=azarah@nosferatu.za.org \
--cc=barkalow@iabervon.org \
--cc=david@dgreaves.com \
--cc=dwheeler@dwheeler.com \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/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://80x24.org/mirrors/git.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).