The parameter name "namelen" suggests that you pass the equivalent of strlen() to the function alloc_ref(). However, this function did not allocate enough space to put a NUL after the name. Since struct ref does not have any member to describe the length of the string, this just does not make sense. So make space for the NUL. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- remote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/remote...

Thanks. I did not know what "marker" meant by the original context and assumed there is a file referred to by the series file but there is no patch in that file. Instead it seems that a series file can contain something that is _not_ a file and that is called the marker, right? -

Thanks for your helpful explanation. So perhaps we can do this on top of yours to be safer and more consistent. --- git-quiltimport.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 880c81d..627e023 100755 --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -79,8 +79,8 @@ for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do git mailinfo "$tmp_msg" "$tmp_patch" \ <"$QUILT_PATCHES/$patch_name...

Signed-off-by: Denis Cheng <crquan@gmail.com> --- contrib/gitview/gitview | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview index 5931766..2eb72b1 100755 --- a/contrib/gitview/gitview +++ b/contrib/gitview/gitview @@ -36,17 +36,6 @@ except ImportError: re_ident = re.compile('(author|committer) (?P<ident>.*) (?P<epoch>\d+) (?P<tz>[+-]\d{4})') -def list_to_string(args, skip): - cou...

Hi, I guess you're looking for "git remote add --mirror origin <url>". AFAIK this is not in any released version yet, though. Ciao, Dscho -

Hi, "git pull" without further parameters accesses the remote "origin", not "backup", and it merges _one_ branch into the current branch. What you should have done is "git fetch backup". Or use "origin" instead of "backup" right from the start, and then use "git fetch". You want to remove branches from the local repo which are no longer there on the remote side? Then "git remote prune" is for you. For details, please see the man page. Ciao, Dscho -

At work, I've been using a git-svn import for my daily workflow (still somewhat of a git newbie, but now has come to the point where it's tough to work without it), and while rebasing from svn (on a rather old branch), I found that the mergetool option does not work too well for me. I am using version 1.5.3 and I have tried all of the different diff tools (save opendiff) that are supported by git -- but in the middle of a rebase, whenever I run the mergetool, the LOCAL, REMOTE, and BASE temporary ...

I've tried all of the ones that were supported, the result is the same -- blank files in all three windows. It is because git mergetool fails to generate these files for whatever reason (the filebasename.{REMOTE,LOCAL,BASE}.* files). I don't know why this happens. As for merge utilities, all I need is something that looks for the first <<<<<, and lets me choose which version I want (either top or bottom), plain and simple :/ I don't even need/want a gui. But oh well, I guess t...

####################################### $ sh -x /usr/local/bin/git-mergetool --tool=meld + USAGE=[--tool=tool] [file to merge] ... + SUBDIRECTORY_OK=Yes + . git-sh-setup + unset CDPATH + [ -z ] + LONG_USAGE=Usage: /usr/local/bin/git-mergetool [--tool=tool] [file to merge] ... + [ -z Yes ] + git rev-parse --git-dir + GIT_DIR=/home/kelvie/src/trunk/.git + test -n /home/kelvie/src/trunk/.git + cd /home/kelvie/src/trunk/.git + pwd + GIT_DIR=/home/kelvie/src/trunk/.git + : /home/kelvie/src/tru...

Egads, it's alive! I was in a subdirectory (most of my work is in that one subdirectory anyways :p), but running it on the top level did indeed work as expected. Thanks, Kelvie -- Kelvie -

It _could_ be just the matter of doing this, although I cannot test it right now (at work and have no access to any of the backends). Care to try it from a subdirectory and report failure or success? --- git-mergetool.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index a0e44f7..018db58 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -12,6 +12,7 @@ USAGE='[--tool=tool] [file to merge] ...' SUBDIRECTORY_OK=Yes . ...

Hrm, on closer inspection, the old version of the mergetool script did this too. It looks like the bug I mentioned does get fixed by that, and this is a bug in emacs (or the way it's called). -- Kelvie -

When mergetool is run from a subdirectory, "ls-files -u" nicely limits the output to conflicted files in that directory, but we need to give the full path to cat-file plumbing to grab the contents of stages. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- * I earlier sent one with cd_to_toplevel but I think the approach in this patch is nicer. git-mergetool.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh ...

--- a/git-mergetool 2007-09-24 09:08:23.000000000 -0700 +++ b/git-mergetool 2007-09-27 15:04:15.000000000 -0700 @@ -12,6 +12,7 @@ SUBDIRECTORY_OK=Yes . git-sh-setup require_work_tree +prefix=$(git rev-parse --show-prefix) # Returns true if the mode reflects a symlink is_symlink () { @@ -162,9 +163,9 @@ local_mode=`git ls-files -u -- "$path" | awk '{if ($3==2) print $1;}'` remote_mode=`git ls-files -u -- "$path" | awk '{if ($3==3) print $1;}'` - base_present ...

Huh? I use xxdiff all the time, and it works fine. -Peff -

Fair enough. -Peff -

Indeed, it seems that since the last time I tested it, it now does diff3 merging. I should reevaluate it :) --=20 =C2=B7O=C2=B7 Pierre Habouzit =C2=B7=C2=B7O madcoder@debia= n.org OOO http://www.madism.org

I know, but: * kdiff3 often take decisions behind your back, and results in broken merges, so it's a no-go ; * xxdiff has (IMHO) a very bad and non-intuitive UI, I never get to make it work ; * I don't use macos (opendiff) ; * emerge is emacs right ? :) Though I gave meld another chance, and it works really better than it used to, so I may give it a try :) Let's hope I won't be disappointed by meld :) --=20 =C2=B7O=C2=B7 Pierre Habouzit =C2=B7=C2=B7O ...

Hello, I have a repository inside another, and for several reasons, I do not want to use git-submodule in this case. My issue is that git-status lists the subrepository as untracked. Of course, I could add it to .gitignore alright, but instead I wonder whether it would not make sense to ignore subdirectories themselves containing .git/ directories, not explicitly so as to not mess with git-submodule, but implicitly. Thoughts? --=20 martin; (greetings from the heart of the sun....

Linear probing is pretty efficient with regard to keeping memory access locality. With a reasonable table filling ratio (not more than something like 75%, for which it is necessary to know the maximum number of hashable entries in advance), there is no gain to be expected in either speed or even memory usage (the waste of 25% is offset by not needing space for link pointers) with escape lists. Linear probing hashes are quite hard to resize: if the maximum member count is _not_ to be guessed in adv...

* make strbuf_read_file take a size hint (works like strbuf_read) * use it in a couple of places. Signed-off-by: Pierre Habouzit <madcoder@debian.org> --- oh boy, once again I sent a half baked patch. okay, I'll stop for today :/ strbuf_read_file returns 0 or -1, not the size read. builtin-apply.c | 12 ++---------- builtin-blame.c | 8 ++------ builtin-tag.c | 19 +++++++------------ strbuf.c | 4 ++-- strbuf.h | 2 +- 5 files changed, 14 insertions(+)...

The default is not --all but "matching branches", iow, what you have never published yet never goes out. Having said that, I would agree that in some workflows "I am on this branch and I would want to push only this branch" would be the norm, and the norm even be "and this branch 'foo' is called identically as 'foo' at the remote site as well". Don't worry about me when discussing to change the default. Myself, I also often push only one or two branches. A typical workflow for me while workin...

I kind of agree. Without reading the git-push man page I would intuitively expect "git push" with no arguments to push only the Ah, nice alias! Thanks for sharing it. Cheers, Wincent -

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> --- lib/blame.tcl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/blame.tcl b/lib/blame.tcl index a911c3c..00ecf21 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -905,7 +905,7 @@ method _open_tooltip {cur_w} { set author_time {} catch {set author_name $header($cmit,author)} catch {set summary $header($cmit,summary)} - catch {set author_time [foramt_date $header($cmit,author-time)]} +...

Hi, When I am running the gitk command I get the following error message:- ======================================================================== =========================== Error in startup script: syntax error in expression "$i >= [llength $argv] && $revtreeargs ne {}" while executing "if {$i >= [llength $argv] && $revtreeargs ne {}} { # no -- on command line, but some arguments (other than -d) if {[catch { set f [eval exec..." (file "./gi...