- Sorry for the noise if this has already been reported. - It's on a Mandriva Spring machine with git 1.5.0.4 - It's a glibc detected memory error. If I restart with MALLOC_CHECK_=0 I dont' get the crash. [bsergean@marge1 src]$ git --version git version 1.5.0.4 [bsergean@marge1 src]$ git clone http://www.kernel.org/pub/scm/git/git.git Initialized empty Git repository in /home/bsergean/src/git/.git/ got de9879a91fd7d4d123a303b4bcdc918f43ca3a62 walk de9879a91fd7d4d123a303b4bcdc918f43ca3a62 got ...

in vi, after making sure that the other instances of "[..]" are not actually invocations of "test". Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- On Mon, 23 Jul 2007, Junio C Hamano wrote: > Johannes Sixt <johannes.sixt@telecom.at> writes: > > > Not all shells grok a closing ']' of the shell '[' command without > > surrounding space. > > > > Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> > > --...

Test if the From: line contains "Mail System Internal Data" and if it is, skip this mail. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- git-am.sh | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/git-am.sh b/git-am.sh index bfd65dc..22d2b5c 100755 --- a/git-am.sh +++ b/git-am.sh @@ -284,6 +284,12 @@ do git mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \ <"$dotest/$msgnum" >"$dotest/info" || stop_here $this + +...

When asking "git log -g --all", clearly you want to see only those refs that do have reflogs, but you do not want it to fail, either. So instead of die()ing, complain about it, but move on to the other refs. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- reflog-walk.c | 7 ++++--- reflog-walk.h | 2 +- revision.c | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/reflog-walk.c b/reflog-walk.c index c983858..7809fad 100644 ---...

Hello, even though git-rebase -i is still young, I'm already a big fan of it. I just want to suggest two minor things: - If a cherry-pick fails, it tells me to resolve my conflicts, 'git add <paths>' and to do 'git commit -c $sha1id'. But it doesn't tell me, how I continue to rebase after that. 'git rebase -i --continue' works. - If a cherry-pick of a commit to be squashed fails, the instruction to do 'git commit -c $sha1id' is wrong, because then I don't get both messag...

Not true. You can add custom diff driver for files using gitattributes xdiff has binary diff, and git has some kind of "ascii-armored" binary diff output. As to how to merge binary files: I suspect that they always conflict, unless the merge is trivial. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -

I not sure if it's worth changing, but you don't necessarily need those [append]'s in there. For example: error_popup [append [mc "Cannot parse Git version string:"] "\n\n$_git_version"] is the same as: error_popup "[mc "Cannot parse Git version string:"]\n\n$_git_version" Again, not sure if it's worth changing the patch, but maybe for future reference. --brett ----- Original Message ---- From: Christian Stimming <stimming@tuhh.de> To: Brett Schwarz <brett_schwa...

Hi Peter, OMG that's horrific! I can't understand how it is possible, on my box (Mandriva with QT4.3) everything is fine. Anyway thanks a lot for the patches. Already applied and pushed. > If anyone wants me to remove that too, i would be happy to send more patches Please feel free to send me any patch that could improve the GUI, unfortunately on my box I'm unable to see all these defects, so any Patchview has not changed for me with your patches, fileview yes, I can see the differen...

Not all shells grok a closing ']' of the shell '[' command without surrounding space. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> --- I didn't go the long way to change all `[ ... ]` into `test ...` git-rebase--interactive.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 579a45e..e0d1326 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -385,7 +385,7 @@ do ...

Hi, Darn. Thanks for cleaning up behind me, Dscho -

hi, the man branch of git.git contains the following lines in git-diff.1: EXAMPLES Various ways to check your working tree $ git diff (1) $ git diff --cached (2) $ git diff HEAD (3) 1. changes in the working tree not yet staged for the next commit. 2. changes between the index and your last commit; what you would be committing if you run "git commit" without "-a" option. ...

We used to take the first non-option argument as the name for the new branch. This syntax is not extensible to support rewriting more than just HEAD. Instead, we now have the following syntax: git filter-branch [<filter options>...] [<rev-list options>] All positive refs given in <rev-list options> are rewritten. Yes, in-place. If a ref was changed, the original head is stored in refs/original/$ref now, for your inspecting pleasure, in addition to the reflogs (sinc...

I was wondering why we don't parse the pine alias format according to the following spec: http://www.washington.edu/pine/tech-notes/low-level.html I'd expect omething like, to get the address field. @@ -225,7 +238,7 @@ my %parse_alias = ( $aliases{$1} = [ split(/\s+/, $2) ]; }}}, pine => sub { my $fh = shift; while (<$fh>) { - if (/^(\S+)\t.*\t(.*)$/) { + if (/^(\S+)\s+(.*)$/) { $alia...

These are useful in organizations that enforce particular formats for commit messages, e.g., to specify bug IDs or test plans. Use of the template is not enforced; it is simply used as the initial content when the editor is invoked. Signed-off-by: Steven Grimm <koreth@midwinter.com> --- Updated based on feedback from Dscho. This depends on his patch to add the --strip-comments option to git-stripspace. That seemed like a pretty uncontroversial change to me, but I can easily switch back ...

Hello, it's more and more common that I get an index-pack death for pread that returns 0... Did anybody encountered the same? Some more details: # uname -a HP-UX aa B.11.11 U 9000/800 1009938148 unlimited-user license # git --version git version 1.5.2.4 # git-clone git://git.kernel.org/pub/scm/git/git Initialized empty Git repository in /home/tpiiuser/mr/git/.git/ remote: Generating pack... remote: Done counting 55910 objects. remote: Deltifying 55910 objects... remote: 100% (55910/55910) ...

I doubt it can be that. pread() is always used on pack data that we already received and validated, and part of the validation is the final pack SHA1. No code path leads to pread() before the final pack SHA1 is tested OK. The only way for the received pack to be truncated and pread() to fail is if write_or_die() somehow failed to write the pack data without Git noticing. Nicolas -

Hi there, I'm the student working on the gsoc libfication project with Shawn and it has reached the point where I need some feedback in order to decide what to do next. The project's goal was/is to change what is needed in GIT in order to make it easier to use as library. This is useful for 'external' applications which wants to be able to perform GIT operations w/o having to fork-exec GIT process (and also w/o having to parse git's programs output). Example of such applications are language bi...

It seems a little bit faster then current one: WITH CURRENT ONE git tree $ time git diff v0.99.. > /dev/null 0.91user 0.02system 0:01.03elapsed 91%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+3594minor)pagefaults 0swaps Linux tree $ time git diff v2.6.22.. > /dev/null 13.61user 0.19system 0:13.90elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+27279minor)pagefaults 0swaps WITH NEW ONE git tree $ time git diff v0.99.. > /dev/null 0....

applymbox is going away. -

'git am' isn't going away, but as Junio mentioned, 'git applymbox' is. Those are two *different* programms doing roughly the same, but 'git applymbox' is superceded by 'git am'. -Peter -

Sorry, for some reason I thought git-am is just a shortcut for git-applymbox. -- Timur Tabi Linux Kernel Developer @ Freescale -

And of course, it would be a nuisance for people managing a patch-based workflow. But those can actually easily set the repository preferences differently, and even find -type d -empty -delete is not too hard to do. So it would even be feasible as default. But I think that in practice, the "track only what has been added recursively" approach is a good default. And since patches without dir information never add anything recursively, it would mostly keep the directories clean. -- David K...

added unlisted options, --contains, --candidates and --debug, to usage line. also, prints some info when --contains and --debug are given. --- Documentation/git-describe.txt | 4 +++- builtin-describe.c | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index ac23e28..f0bcb61 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -8,7 +8,9 @@ git-describe - Show ...

I was actually going to suggest removing these options, that were primarily meant for debugging and tweaking while we figure out what the optimum default should be. Do you think they are worth keeping? -

Nah, I already noticed your Ack and inferred that you would want to keep them. Haven't applied the patches yet, though. -