Hi, I want to checkout a git package. I installed git and when I give the command "/root/bin/git clone git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git /home/Kaushalya/moreWork/git_test " I got the result as Initialized empty Git repository in /home/Kaushalya/moreWork/git_test/.git/ git.kernel.org[0: 140.211.167.38]: errno=Connection timed out fatal: unable to connect a socket (Connection timed out) fetch-pack from 'git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git' fa...

This test-script tries to excercise the porcelainish aspects of git-merge. Signed-off-by: Lars Hjemli <hjemli@gmail.com> --- t/t7600-merge.sh | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 317 insertions(+), 0 deletions(-) create mode 100755 t/t7600-merge.sh diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh new file mode 100755 index 0000000..9e58636 --- /dev/null +++ b/t/t7600-merge.sh @@ -0,0 +1,317 @@ +#!/bin/sh +# +# Copyright (c) 2007 Lars Hjeml...

This enables per branch configuration of merge options. Currently, the most useful options to specify per branch are --squash, --summary/--no-summary and possibly --strategy, but all options are supported. Note: Options containing whitespace will _not_ be handled correctly. Luckily, the only option which can include whitespace is --message and it doesn't make much sense to give that option a default value. Signed-off-by: Lars Hjemli <hjemli@gmail.com> --- Documentation/config.txt | ...

These new options can be used to control the policy for fast-forward merges: --ff allows it (this is the default) while --no-ff will create a merge commit. Signed-off-by: Lars Hjemli <hjemli@gmail.com> --- Documentation/merge-options.txt | 9 +++++++++ git-merge.sh | 20 +++++++++++++++----- t/t7600-merge.sh | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/Documentation/merge-options.txt b/Documentation/merge...

Personally, I find this idiom distasteful. I'd do either while case $# in 0) false ;; *) true esac or, more likely while : do case $# in 0) break;; esac But doing a break inside of the while _condition_ rather than the body just feels wrong to me. -- David Kastrup -

I did not mean "BSD shell" in general here. The shell Eygene uses on his (unspecified version of) FreeBSD box is failing. -

People may wonder why this is not run when they do "git checkout otherbranch path.c"; the second sentence from the above description implies why it shouldn't, but the first sentence probably should state it more clearly. What's the _semantics_ you are trying to achieve? Why does the hook run every time git-bisect suggests the next revision to try? Why does the hook run when rebase starts its work? When "git pull" or "git merge" results in a fast forward, the situation is no different from...

I run my git commands inside an Emacs *shell* buffer, so I don't want it running 'less' all the time. I export GIT_PAGER=cat to stop it. I just tried a "git-svn log" and it failed: $ GIT_PAGER=cat git-svn log Use of uninitialized value in exec at /usr/bin/git-svn line 3451. Use of uninitialized value in concatenation (.) or string at /usr/bin/git-svn line 3451. Can't run pager: Illegal seek () I don't get a shell prompt back. It just hangs. This is on ubuntu feisty with the ubuntu-backpor...

Good day. I had found that FreeBSD's /bin/sh refuses to work with git 1.5.3.2. correctly: no flags are recognized. The details and fix are below. I don't currently know if the Bash's behaviour is POSIXly correct or the 'case' statement semantics is not very well defined. But the following patch fixes the things for the FreeBSD. Here we go. ----- Option parsing in the Git shell scripts uses the construct 'while case "$#" in 0) break ;; esac; do ... done'. This is neat, because it needs ...

I do not doubt that "while case $# in 0) break ;; esac" does not work for your shell. But I think the above comment is grossly misleading. Don't mention bash there. You sound as if you are blaming bashism, but the thing is, your shell is simply broken. You have other choices than bash on BSD don't you? My quick test shows that ksh, pdksh and dash seem to work correctly. This idiom is what I picked up around late 80's from somebody, and kept using on many variants of Unices. I would find...

Add 'status_str' to diffinfo output, which stores status (also for merge commit) as a string. This allows for easy checking if there is given status among all for merge commit, e.g. $diffinfo->{'status_str'} =~ /D/ Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- This is to simplify _future_ code, so I won't cry if it is not accepted without some code that needs it. gitweb/gitweb.perl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

There are some cases when one line from "raw" git-diff output (raw format) corresponds to more than one patch in the patchset git-diff output; we call this situation "split patch". Old code misdetected subsequent patches (for different files) with the same pre-image and post-image as fragments of "split patch", leading to mislabeled from-file/to-file diff header etc. Old code used pre-image and post-image SHA-1 identifier ('from_id' and 'to_id') to check if current patch corresponds to old raw diff...

In commit 90921740bd00029708370673fdc537522aa48e6f "gitweb: Split git_patchset_body into separate subroutines" a part of git_patchset_body code was separated into parse_from_to_diffinfo subroutine. But instead of replacing the separated code by the call to mentioned subroutine, the call to subroutine was placed before the separated code. This patch removes parse_from_to_diffinfo code from git_patchset_body subroutine. Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- My bad... I h...

Signed-off-by: Kristian Høgsberg <krh@redhat.com> --- Makefile | 2 +- builtin-commit.c | 117 ++++++++---------------------------------------------- parse-options.c | 74 ++++++++++++++++++++++++++++++++++ parse-options.h | 29 +++++++++++++ 4 files changed, 121 insertions(+), 101 deletions(-) create mode 100644 parse-options.c create mode 100644 parse-options.h diff --git a/Makefile b/Makefile index 69ebc7a..2612465 100644 --- a/Makefile +++ b/Makefile @@ -310,7 ...

This removes the extra copy in builtin-commit.c and uses the update() function from builtin-add.c. Signed-off-by: Kristian Høgsberg <krh@redhat.com> --- builtin-add.c | 8 +++--- builtin-commit.c | 65 +++++++++++------------------------------------------ commit.h | 2 + 3 files changed, 20 insertions(+), 55 deletions(-) diff --git a/builtin-add.c b/builtin-add.c index 5e30380..966e145 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -107,7 +107,7 @@ static void u...

Signed-off-by: Matt Kraai <kraai@ftbfs.org> --- Documentation/git-prune-packed.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt index 3800edb..9f85f38 100644 --- a/Documentation/git-prune-packed.txt +++ b/Documentation/git-prune-packed.txt @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -This program search the `$GIT_OBJECT_DIR` for all objects that currently +This program searc...

Signed-off-by: Matt Kraai <kraai@ftbfs.org> --- Documentation/git-pack-objects.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 628f296..5237ab0 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -25,16 +25,16 @@ is efficient to access. The packed archive format (.pack) is designed to be unpackable without having anything else, but for...

Hi, I haven't looked at it closely, but there is a GitFS: http://git.or.cz/gitwiki/InterfacesFrontendsAndTools#head-f354b40618742b976c13700fe1fe... (I am pointing you to the Git Wiki, so that you can find more pointers should you not be happy with this one.) Ciao, Dscho -

Thank you. This is was I was looking for. My motivation is whether it is possible to run a system, for example Debian on a computer on top of gitfs, and then have a huge mirror on it, for example a complete 252GB Debian mirror as space efficient as possible. I wonder how big a deltified Debian mirror in one pack file would be. :) Peter -

On a similar note, has anybody experimented with using git to store maildirs or news spools? I'd imagine the quoted portions of most message threads could be delta-compressed quite efficiently. -- Eric Wong -

D'oh. I already have maildir performance problems on my laptop. I wonder how well only having an index and no commits (no versioning), and manual packing with pack-objects would work. Packing could be optimized to order objects based on the Message-Id, References, and In-Reply-To headers, too. -- Eric Wong -

I don't think so. Architecture-independent files are usually separated out into separate packages (think of the -doc and -data packages) that get architecture "all" and land in the Debian archive only once. So you probably won't save too much there. Chris -

Very, very close to 252 GB, since .deb files are already compressed. If it's just the gzip compression you want, surely there must be real filesystems that can do that. -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle -

You can unpack contain of gzipped or bzipped files and deltify it, but you cannot restore exactly the same gzip or bzip file based on its content unless you use exactly the same version of compressor that was used to create the original file. So, if you put any .deb file in such a system, you will get back a different .deb file (with a different SHA1). So, aside high CPU and memory requirements, this system cannot work in principle unless all users have exactly the same version of a compressor. D...

Nightmare indeed. I actually wrote a proof of concept for this idea for gzip. http://git.catalyst.net.nz/gw?p=git.git;a=shortlog;h=archive-blobs (see also http://planet.catalyst.net.nz/blog/2006/07/17/samv/xteddy_caught_consuming_rampant_amo...) I usually warn people that this undertaking is "slightly insane". My implementation was designed to be called like "git-hash-object". What it did was look at the input stream, and detect quickly whether it looked like a gzip stream. ...