Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> --- git-compat-util.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h index a18235e..7498bee 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -268,6 +268,12 @@ static inline void *xmalloc(size_t size) return ret; } +/* + * xmemdupz() allocates (len + 1) bytes of memory, duplicates "len" bytes of + * "data" to the allocated memory, zero terminate...

I've found that git-svn gets slower as it runs. Try interrupting the clone and running "git svn fetch" -- it should pick up where it left off and will be MUCH faster if my experience is any indication. When I clone the big svn repository at work I usually restart it every 1000 revisions or so and it finishes in a fraction of the time it takes if I let it do everything in a single run. -Steve --

Signed-off-by: Tom ten Thij <git@tomtenthij.nl> --- Add support for other colors in pretty format the same way %Cred works. I reordered the if statements to start with the reset case and order the others by ansi color code. Not sure if I have to edit other files or how to do testing for a complete patch. Documentation/pretty-formats.txt | 5 +++++ pretty.c | 21 ++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Documentatio...

get the git source, checkout the 1.4.x version you have on your Live Web Server, compile and install it in your $HOME on developnment machine and try things out before doing them on production system. But it is actually quite simple to uninstall the old git on both systems, compile the newest git, and just install it everywhere. --

For an announcement of a new project, I must say that it is *very* short on details on what Pyrite acutally is and what it does. I now know where to find it and some things about the project status, but I have no idea why I should be interested. I even followed the link above, but I still have no idea, although now I know that it has -- David Kågedal --

On Thu, Apr 24, 2008 at 1:42 AM, Govind Salinas I got several responses about how the announcement was short on details. You guys are absolutely right, I blame the benedryl and the late hour. Anyways... Pyrite, in its current form, is a git porcelain. Its focus is to reduce the learning curve, increase portability and, basically, make it as easy to use as possible. I say "in its current form" because this is simply the first stage of Pyrite's development. When Pyrite is complete I expect t...

See the documentation for an explanation of this feature. Signed-off-by: Sverre Hvammen Johansen <hvammen@gmail.com> --- Documentation/git-merge.txt | 43 ++++++++++++++++++++++++++++++++++++- git-merge.sh | 50 ++++++++++++++++++++++++------------------- 2 files changed, 70 insertions(+), 23 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 2af33d8..f6bc96f 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.t...

--ff now takes an argument allowing --ff to be written as --ff=allow and -no-ff to be written as --ff=never. This change allow other fast forward options to be introduced later. See the documentation for a further explanation of these options. Signed-off-by: Sverre Hvammen Johansen <hvammen@gmail.com> --- Documentation/fast-forward-options.txt | 44 ++++++++ Documentation/git-merge.txt | 6 +- Documentation/git-pull.txt | 2 + Documentation/merge-options.t...

make git status act similar to git log and git diff by presenting long output in a pager. Signed-off-by: Bart Trojanowski <bart@jukie.net> --- git.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git.c b/git.c index c4e4644..89b431f 100644 --- a/git.c +++ b/git.c @@ -347,7 +347,7 @@ static void handle_internal_command(int argc, const char **argv) { "shortlog", cmd_shortlog, USE_PAGER }, { "show-branch", cmd_show_branch, RUN_SETUP }, { "show", cmd_sh...

On Thu, Apr 24, 2008 at 4:21 AM, Johannes Schindelin Yes. This also helps those of use who didn't know you could alias status to always page and were constantly typing git status |less. Thanks! --

But even with `git gc --prune` the old commit object will still be in your repository. Why? Both HEAD and your branch's reflog have a reference to the old commit. And those will remain in there for 90 days by default, so that you could always go back and get that if you _really_ had to recover it. Take a look with `git reflog show HEAD` or `git log -g` and you'll see what I mean. A commit is peanuts when it comes to disk space. Don't worry about it. After a lot of amends and such you will...

[snip] There's a relatively recent change in this area. Git keeps stuff that's apparently unattached for a period of, by default, 2 weeks (determined by gc.pruneexpire variable) after which a git gc will remove it. The reasoning is that even with the careful design of the git updating strategy there are rare times when with a concurrent other git process there are files in the repo that look unattached but will become attached as the other process completes. Files kept this way aren't propagated b...

Well, the thread is not very explicative. Neither is the commit log message. There is no info as to *why* it is useful. After finding no particularly good info in the commit, and seeing that the functionality is unused within git's shell script porcelain, I wrote my RFC on the intuition that it is a failed experiment. (The rest of Hm, bad sentence on my side. My point was that my proposed improvements to clone: git clone --bare -o origin <url> foo.git satisfy 99% of the u...

If you know the name of the objects you are missing, you can make a temporary pack to transfer the list of objects: # at good repo # git pack-objects --stdout <object.list >save.pack # at bad repo # git index-pack --stdin <save.pack Make object.list just one SHA-1 per line. The resulting pack is not likely to be highly compressed, as it will probably contain a non-delta version of each object, but its faster to create than calling git-cat-file for each object, and may give...

Works for me using git svn clone. git svn init fails for me, too. $ git --version git version 1.5.5.1.57.g5909c $ git svn clone http://svn.apache.org/repos/asf/incubator/couchdb Initialized empty Git repository in .git/ W: Ignoring error from SVN, path probably does not exist: (175007): HTTP Path Not Found: REPORT request failed on '/repos/asf/!svn/bc/100/incubator/couchdb': '/repos/asf/!svn/bc/100/incubator/couchdb' path not found W: Do not be alarmed at the above message git-svn is just searc...

This information would have helped me quite a bit when I first encountered this problem. It would be nice if it also showed up under git-prune (since git-gc doesn't delete anything itself, if I understand correctly). Also a link to some information about reflogs (even just to "see also" git-reflog) would help, since I didn't hear about reflogs at all until after I joined the mailing list. Avery --

I gather there's a movement in recent git versions (sorry, I only tuned in recently) to encourage people to use git-gc instead of git-prune in almost all cases. The reasons I ever looked at git-prune at all was that git-gc mentioned it in "See Also", and because "git-prune" sounded more obviously like what I wanted than "git-gc" when I looked at "man git". Adding git-gc *and* git-reflog as See Also entries in git-prune would make sense to me. Avery --

Hello, Fine. BTW, even with your patch the problem still exists for git-diff. I havn't yet looked into it. Uwe -- Uwe Kleine-König, Software Engineer Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962 --

Actually only: git diff git diff -2 git diff -3 for: $ git diff -1 * Unmerged path file1 diff --git a/file1 b/file1 index 7898192..c9c6af7 100644 --- a/file1 +++ b/file1 @@ -1 +1 @@ -a +b1 but "-2" and "-3" do the same for different reasons -2) theres is no "2" in the index -3) is equal to the wc file1 so both output the same: * Unmerged path file1 and I still think "git diff" has to output something else than --

Yes, of course! So I stand corrected, and Jeff's patch makes sense. For consistency's sake, the path should be made available in, say, GIT_BLOB_PATH just like the commit is available in GIT_COMMIT. -- Hannes --

Hi, I start to wonder if "git fast-export --all | my-intelligent-perl-script | git fast-import" would not be a better solution here. All you would have to do is to detect when a blob begins, and how long it is, and work with that. If your trees do not contain any binary files, it should be trivial. Ciao, Dscho --

Here's another work around that doesn't require editing the code. Just turn the d**n spell checker off: git config --global gui.spellingdictionary none That will keep us from evening trying to launch aspell, and since its global (in your ~/.gitconfig) it should default into every repository you have, or create. Apparently aspell 0.50 does not like git-gui. I'll have to look at the version header and abort trying to use aspell if it is pre 0.60. git-gui 0.10.2 here we come. -- Shawn....