Hi, I recently came across a big conflict. Someone used Subversion and made a complete wrong commit. I did a 'git svn rebase' at some point and ran into the conflict. My goal at this point was to remove the wrong commit, but I found no way how to do it (git-revert needs a clean tree; git stash brought [fatal: git-write-tree: error building trees,Cannot save the current state]). What way would suggest to remove that wrong made commit and continue with the rebase? Thanks for any hints. --

Extra paragraphs should be prefixed with a plus sign. Signed-off-by: Stephen Boyd <bebarino@gmail.com> --- Documentation/git-add.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 45ebf87..e93e606 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -76,10 +76,10 @@ OPTIONS work tree and add them to the index. This gives the user a chance to review the difference before ...

This looked pretty straightforward. I guess --name-status is there for backward compatibility. Should it be there anymore? Stephen Boyd (2): t3101: test more ls-tree options ls-tree: migrate to parse-options builtin-ls-tree.c | 100 +++++++++++++++++-------------------------- t/t3101-ls-tree-dirname.sh | 89 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 127 insertions(+), 62 deletions(-) --

Signed-off-by: Stephen Boyd <bebarino@gmail.com> --- builtin-ls-tree.c | 100 +++++++++++++++++++++------------------------------- 1 files changed, 40 insertions(+), 60 deletions(-) diff --git a/builtin-ls-tree.c b/builtin-ls-tree.c index 22008df..04408df 100644 --- a/builtin-ls-tree.c +++ b/builtin-ls-tree.c @@ -9,6 +9,7 @@ #include "commit.h" #include "quote.h" #include "builtin.h" +#include "parse-options.h" static int line_termination = '\n'; #define LS_RECURSIVE 1 @@ ...

A few weeks ago there was a bug report that some invalid commands produced confusing error messages. The fix could have made things simpler. There's no need for die_with_patch in this case, because its purpose is to tell rerere and a future rebase --continue about a commit that we just attempted, and we didn't attempt any commit. So just use a plain "die" unconditionally. Signed-off-by: Greg Price <price@mit.edu> --- git-rebase--interactive.sh | 7 +------ 1 files changed, 1 ...

I can't answer the questions about proper etiquette, but you *can* do more changes if you first apply Nanako's patch on top of your previous changes. /Björn -- Björn Gustavsson, Erlang/OTP, Ericsson AB --

Support for git's extended header lines for renames, copies, hashes, file modes would be great. I'll happily take patches or eventually implement it myself. Binary patches are not as high on my wish list, but feel free to send Isn't there a better way to do this than with patches? Thanks, Andreas --

You are given 1,000,000.00 Pounds by the British Telecom Promo Name:.............. Address:.......... Occupation:........ Phone Number:..... --

Thanks, applied. Paul. --

Thanks, applied. Paul. --

Support for the other extended header lines would be useful for me too. I might have a go at implementing them (and binary patches) at some If there is a better way, I would be very interested in finding out what it is. Feeding the output from 'git format-patch' to patch is the best way I've had come up with yet. patch (given the '-g 1' option) will automatically check out the files that are to be patched. I have wrapped that in a simple script that retrieves the commit comment from the ...

Hi, Why? Don't get overly creative here, the command . /path/to/git-completion.bash already does that, plus it fixes the merge strategy completion issue, and it's friendly enough for the users. Best, Gábor --

Heya, Can you be more specific, what is the layout of your repository and which directories are missing? / -- trunk -- branches -- tags -- thirdparty -- private If your repository looks like that, and 'thirdparty' and 'private' are missing, that's because git svn assumes that you're only interested in trunk, branches and tags by default. -- Cheers, Sverre Rabbelier --

The reverse reference has long existed, and the autocrlf description was actually obsolete and wrong (saying only file content is used), not just incomplete. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> --- Documentation/config.txt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index d1e2120..0dc6b12 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -169,9 +169,10 @@ ...

My bare repository is on an OpenBSD machine. I was unaware of the importance of git gc until today after investigating a problem with "git pull". So there hasn't been run git gc on the repository ever. The biggest file in the repository is a 45 mb file. The repository size is near 2 gb. What can I do? $ git gc Counting objects: 5934, done. warning: suboptimal pack - out of memory fatal: Out of memory, malloc failed8) error: failed to run repack $ git --version git version 1.6.5.2 $ ...

Hi Gábor, Sounds like a good approach. Squashing this in should get that working again. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- In this patch, I assume the merge strategy list is not being cached any more. Something like this would allow recovering from the merge strategy completion issue, but the victim would have to notice what went wrong first. contrib/completion/git-completion.bash | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git ...

Thank you very much! That did the trick. Now to update svn2git.sh... -- Victor Engmark --

Found with valgrind while looking for Content-Length corruption in smart http. Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com> --- http-backend.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/http-backend.c b/http-backend.c index f8ea9d7..ab9433d 100644 --- a/http-backend.c +++ b/http-backend.c @@ -634,7 +634,7 @@ int main(int argc, char **argv) cmd = c; cmd_arg = xmalloc(n); strncpy(cmd_arg, dir + out[0].rm_so + 1, n); - cmd_arg[n] = ...

[Empty message]

This fix is better than the (uintmax_t) cast that I was thinking about posting. Please also consider the "__attribute__((format(printf,1,2))" patches that I just posted to the list that would warn about this in the future. Thanks, Tarmigan --

It took me a while (possibly due to low caffeine levels) to make a failing (automated) test case, but I've also pushed this out as well. From e2f8617b266e320fd58ab584cae2ebe9906daaac Mon Sep 17 00:00:00 2001 From: Eric Wong <normalperson@yhbt.net> Date: Sat, 14 Nov 2009 14:43:20 -0800 Subject: [PATCH] git svn: add authorsfile test case for ~/.gitconfig The commit for: git svn: read global+system config for clone+init Initially lacked a test case because the author was unable ...

Francis Moreau schreef: > hello, > > Let's say I'm on a branch called 'foo'. > > I tried to rebase this branch by using 'git pull --rebase'. > > I first tried the following command: > > $ git pull --rebase origin master:foo > remote: Counting objects: 5, done. > remote: Total 3 (delta 0), reused 0 (delta 0) > Unpacking objects: 100% (3/3), done. > From /dev/shm/git/A > ! [rejected] master -> foo (non fast forward) When using a refspec, ...

Hi I recently started to use git, and I experienced problems with branches: on my machine I did (on an already cloned repo) git checkout -b experiments origin/experiments and thus my config reads [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* url = git://... [branch "master"] remote = origin merge = refs/heads/master [branch "experiments"] remote = origin merge = refs/heads/experiments isn't this enough to be ...

Hi Junio, since 916a3c4b7 "Autogenerated manpages for v1.6.5.1-69-g36942", some of the man pages in the "man" branch have a lot of the ".ft C" and ".ft" noise. Apparently, you upgrade some parts of your system, as the changes that introduced the noise also show: -.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> +.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/> And that new version seems to somehow end up producing: -\.ft C +\&.ft ...