git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Kai Hendry" <hendry@aplixcorp.com>
To: git@vger.kernel.org
Subject: Integration branching
Date: Mon, 7 Apr 2008 14:02:03 +0100	[thread overview]
Message-ID: <b24851260804070602o11b93923m7ce7d79d5f59547b@mail.gmail.com> (raw)

I've been asked to setup & host a git repo of an "integration branch"
of WebKit for our developers.

So I expected it to work like so:

git clone git://git.webkit.org/WebKit.git
git checkout -b test

<Make a few small changes and commit>

git-config remote.upload.url ssh://git.webvm.net/srv/git/webkit-test
x61:~/aplix/test/WebKit% git push --thin -v upload test
Pushing to ssh://git.webvm.net/srv/git/webkit-test
Counting objects: 371612, done.
Compressing objects: 100% (67851/67851), done.
Writing objects:  11% (43886/371612), 25.32 MiB | 88 KiB/

However when uploading the branch it seems to upload _everything_
which is far too big and impractical. Couldn't it just somehow
reference the remote branch and just publish the patch of the "small
changes"?

When doing a git-http-push instead of ssh, git resulted in a "Out of
memory" error:

   1. git clone git://git.webkit.org/WebKit.git # Check it out
   2. git checkout -b test # create a "test" branch and switch to it
   3. echo blah >> ChangeLog # change something
   4. git commit -a # commit that test change
   5. git-config remote.upload.url http://moto@moto.webvm.net/moto.git
# configure the upload url
   6. git push upload test # fatal: Out of memory, malloc failed

Was this the fault of the server(nox) or client(x61)?

x61:~% git --version
git version 1.5.4.5
nox:~% git --version
git version 1.5.4.4

So is there some better way of publishing a branch? Without uploading
the whole WebKit?



I did try something else, that was to create a webkit repo on the
server nox like so:

nox:/srv/git/webkit% git --bare init --shared
nox:/srv/git/webkit% git --bare fetch git://git.webkit.org/WebKit.git
master:master
git fetch -f git://git.webkit.org/WebKit.git master:master # again
forcing updates

And let developers branch from that. This proved a little cumbersome
as I need to manually force updates to webkit trunk when developers
asked me to do that.
However once a developer cloned ssh://git.webvm.net/srv/git/webkit.
Creating a test branch 'deleteme' and then `git push origin deleteme`
was extremely fast. So I guess this is the right way to achieve my
goals?


Any suggestions and tips would be greatly appreciated!

             reply	other threads:[~2008-04-07 13:02 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-07 13:02 Kai Hendry [this message]
2008-04-07 17:41 ` Integration branching Junio C Hamano
2008-04-07 18:18   ` Kai Hendry
2008-04-07 18:32     ` Avery Pennarun
2008-04-08 13:56       ` Kai Hendry
2008-04-08 18:49         ` Junio C Hamano
2008-04-08 19:01           ` Mike Hommey
2008-04-08 20:32             ` Kai Hendry
2008-04-08 20:43               ` Mike Hommey
2008-04-10 20:04                 ` Mike Hommey
2008-04-07 18:44     ` Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b24851260804070602o11b93923m7ce7d79d5f59547b@mail.gmail.com \
    --to=hendry@aplixcorp.com \
    --cc=git@vger.kernel.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.
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 NNTP newsgroup(s).