git mailing list

FromSubjectsort iconDate
Nicolas Pitre
[PATCH 2/2] add throughput display to index-pack
... and call it "Receiving objects" when over stdin to look clearer to end users. Signed-off-by: Nicolas Pitre <nico@cam.org> --- diff --git a/index-pack.c b/index-pack.c index 2f149a4..d32c7b9 100644 --- a/index-pack.c +++ b/index-pack.c @@ -87,6 +87,8 @@ static void *fill(int min) die("early EOF"); die("read error on input: %s", strerror(errno)); } + if (verbose && from_stdin) + display_throughput(&progress, ret); input_len += ret; } while (input_len < min); ...
Oct 29, 4:25 pm 2007
Nicolas Pitre
[PATCH 1/2] add throughput to progress display
This adds the ability for the progress code to also display throughput when that makes sense. The math was inspired by commit c548cf4ee0737a321ffe94f6a97c65baf87281be from Linus. Signed-off-by: Nicolas Pitre <nico@cam.org> --- diff --git a/progress.c b/progress.c index 7629e05..275579b 100644 --- a/progress.c +++ b/progress.c @@ -37,7 +37,7 @@ static void clear_progress_signal(void) static int display(struct progress *progress, unsigned n, int done) { - char *eol; + char *eol, ...
Oct 29, 4:22 pm 2007
Wincent Colaiuta
Re: Bug in git-show with "%ai" and "%ci" formats?
Doh... funny... This was only yesterday; I installed 1.5.2.4 (stupidly, a typo) and the 1.5.3.4 man pages. If I'd just done a "git stash" or something I would've realized that I was using an older version... Cheers, Wincent -
Oct 29, 7:28 am 2007
Johannes Schindelin
Re: Bug in git-show with "%ai" and "%ci" formats?
Hi, It was added in v1.5.3-rc2~17. Usually, it is a good idea to use the documentation which corresponds with the git version you are using ;-) Hth, Dscho -
Oct 29, 6:32 am 2007
Wincent Colaiuta
Bug in git-show with "%ai" and "%ci" formats?
Can anybody reproduce the following behaviour? Basically all the author and committer date formats documented in the git-show man page work except for "%ai" and "%ci". This is with Git 1.5.2.4 running on Darwin 9.0.0: $ git show -s --pretty=format:"%ad" Sun Oct 28 20:58:39 2007 +0100 $ git show -s --pretty=format:"%aD" Sun, 28 Oct 2007 20:58:39 +0100 $ git show -s --pretty=format:"%ar" 17 hours ago $ git show -s --pretty=format:"%at" 1193601519 $ git show -s ...
Oct 29, 6:18 am 2007
Lars Hjemli
[PATCH] Teach git-pull about --[no-]ff, --no-squash and ...
These options are supported by git-merge, but git-pull didn't know about them. Signed-off-by: Lars Hjemli <hjemli@gmail.com> --- git-pull.sh | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index 74bfc16..39e5222 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,7 +4,7 @@ # # Fetch one or more remote refs and merge it/them into the current HEAD. -USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] ...
Oct 29, 1:41 am 2007
Morten Welinder
Re: [PATCH] Speedup scanning for excluded files.
Is there some guarantee that the result of that subtraction is still within the string? Morten -
Oct 29, 3:59 pm 2007
Junio C Hamano
Re: [PATCH] Speedup scanning for excluded files.
Thanks. This looks obviously correct and tempts me to apply directly to 'master'. There are similar logic on the gitattributes side (attr.c) which might benefit from such an optimization as well. In the longer run, we might even want to introduce 'ignored' attribute to the gitattributes mechanism and make the unified result to supersede gitignore. -
Oct 29, 3:17 pm 2007
Lars Knoll
Re: [PATCH] Speedup scanning for excluded files.
From 51b364c9c87bec89556a2089cc5363c588ea2ff5 Mon Sep 17 00:00:00 2001 From: Lars Knoll <lars@trolltech.com> Date: Sun, 28 Oct 2007 21:27:13 +0100 Subject: [PATCH] Speedup scanning for excluded files. Try to avoid a lot of work scanning for excluded files, by caching some more information when setting up the exclusion data structure. Speeds up 'git runstatus' on a repository containing the Qt sources by 30% and reduces the amount of instructions executed (as measured by valgrind) by ...
Oct 29, 1:59 am 2007
Pierre Habouzit
Re: [PATCH] Speedup scanning for excluded files.
return string[strcspn(string, "*?[{")] =3D=3D '\0'; is faster as it doesn't scan the string 4 time in the case where there You used spaces in here, and in many places of your patch. --=20 =C2=B7O=C2=B7 Pierre Habouzit =C2=B7=C2=B7O madcoder@debia= n.org OOO http://www.madism.org
Oct 29, 1:02 am 2007
Lars Knoll
[PATCH] Speedup scanning for excluded files.
Try to avoid a lot of work while scanning for excluded files, by caching some more information when setting up the exclusion data structure. Speeds up 'git runstatus' on a repository containing the Qt sources by 30% and reduces the amount of instructions executed (as measured by valgrind) by a factor of 2. --- I did a short timing measurement on the git repository itself, the timings without and with the patch give: [lars@dahab git (speedup)]$ time git runstatus > /dev/null real ...
Oct 29, 12:45 am 2007
Benoit Sigoure
[PATCH] Fix a small memory leak in builtin-add
prune_directory and fill_directory allocated one byte per pathspec and never freed it. Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr> --- I don't know whether this was intentionnal or not (since it's only a matter of having small chunks of memory not being reclaimed and I don't think we can enter these functions twice, so these are not leaks in the sense that the program will consume more and more memory). But if it was intentionnal, wouldn't it be better to put a small comment in the ...
Oct 29, 12:00 am 2007
Benoit Sigoure
[PATCH] core-tutorial: Catch up with current Git
No longer talk about Cogito since it's deprecated. Some scripts (such as git-reset or git-branch) have undergone builtinification so adjust the text to reflect this. Fix a typo in the description of git-show-branch (merges are indicated by a `-', not by a `.'). git-pull/git-push do not seem to use the dumb git-ssh-fetch/git-ssh-upload (the text was probably missing a word). Adjust a link that wasn't rendered properly because it was wrapped. Signed-off-by: Benoit Sigoure ...
Oct 29, 12:00 am 2007
Christian Couder
[PATCH] Bisect: add "skip" to the short usage string.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- git-bisect.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index 180c6c2..f2bae53 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -1,6 +1,6 @@ #!/bin/sh -USAGE='[start|bad|good|next|reset|visualize|replay|log|run]' +USAGE='[start|bad|good|next|reset|visualize|replay|log|skip|run]' LONG_USAGE='git bisect start [<bad> [<good>...]] [--] [<pathspec>...] ...
Oct 28, 9:31 pm 2007
David Symonds
Re: [PATCH] Bisect: add "skip" to the short usage string.
"skip" should be closer to the "bad" and "good" options, since it's most similar to them in that list. Dave. -
Oct 28, 9:35 pm 2007
Lars Hjemli
Re: [BUG?] git-pull and git-merge don't support option - ...
--ff/--no-ff is not part of any released git version; you'll need to build the 'master' branch of git.git. And they're currently only supported by git-merge, not git-pull (the same goes for --no-squash). -- larsh -
Oct 29, 12:14 am 2007
Yin Ping Oct 29, 6:05 am 2007
Nicolas Pitre
Re: [RFH] gcc constant expression warning...
The test must also make sure off_t isn't signed, since in that case it can only hold 31 bits. Nicolas -
Oct 28, 5:55 pm 2007
Linus Torvalds
Re: [RFH] gcc constant expression warning...
Sinc eneither 31 _nor_ 32 bits is really enough, it's perfectly fine to just check that the size of "off_t" is *bigger* than 4 bytes, which my pseudo-patch did. Linus -
Oct 28, 9:37 pm 2007
Stephen Rothwell
Re: [RFH] gcc constant expression warning...
Posix says: "blkcnt_t and off_t shall be signed integer types." =20 --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Oct 28, 7:41 pm 2007
Yin Ping
Re: How to merge git://repo.or.cz/git-gui into git.git
When i merged git.git into git-gui with subtree strategy, I found all histories of git.git merged into histories of git-gui (from 584 history entries to 11985). Is it possible that only histories related to git-gui subdirectory in git.git(i.e. histories displayed by git-log git-gui) are merged into? 1. my configuration: ~/git-gui$ git-remote show git * remote git URL: git://git.kernel.org/pub/scm/git/git.git Tracked remote branches master ~/git-gui$ git-remote show origin * ...
Oct 28, 11:45 pm 2007
Michele Ballabio
Re: New features in gitk
This is probably causing gitk to eat my (admittedly old) CPU, sometimes. For example, a gitk --all v1.5.2..v1.5.3 gives me problems when I scroll down to about half of the shown history: that is when I reach the sequence of hundreds of "merge topic branch into next" commits, and gitk tries hard to display the graph as best as it can. It can become unresponsive for one second at every PgDown. Otherwise, gitk is way faster in other (non-pathological) circumstances. -
Oct 29, 7:04 am 2007
Pierre Habouzit
Re: New features in gitk
Right, would have I known a single word of Tcl, I would have provided patches for that long time ago btw :P --=20 =C2=B7O=C2=B7 Pierre Habouzit =C2=B7=C2=B7O madcoder@debia= n.org OOO http://www.madism.org
Oct 28, 11:24 pm 2007
Han-Wen Nienhuys
Re: New features in gitk
sound extremely cool; I didn't know someone was working on it actively. Can I misuse this thread to bring a ancient bug under your attention? It is affecting me regularly; see here for the report: http://article.gmane.org/gmane.comp.version-control.git/48789 -- Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen -
Oct 29, 6:30 am 2007
Jonathan del Strother
Re: New features in gitk
FWIW, I have exactly the same problem under OS X. I've never figured out a pattern that gives a guaranteed copy - I'll try playing around today and see what I can find. Actually, while I'm here, gitk semi-regularly ignores ⌘Q, which ought to quit on OS X.-
Oct 29, 1:31 am 2007
Pierre Habouzit
Re: New features in gitk
I believe that git show/diff has it right: lines with a + should be in the "added" color, and lines with a '-' in the "removed" one. gitk only take the first "column" of +/- into account or sth I find awkward at best, and I often go to the console to see a merge commit because of Well, doing ^C doesn't always copy it (probably a glitch wrt which input has the focus), and it certainly doesn't synchronize with the cut buffer for me. And it doesn't work for anyone at work either. I use ...
Oct 28, 11:20 pm 2007
Junio C Hamano
Re: [PATCH 6/7] include $PATH in generating list of comm ...
Thanks. It's easier to read if you briefly describe the differences between the replacement patch and the previous version of the patch below the three-dash lines. See for example Lars Knoll's patch from today <200710290959.32538.lars@trolltech.com>. -
Oct 29, 2:17 pm 2007
Scott Parish
Re: [PATCH 6/7] include $PATH in generating list of comm ...
I was thinking set operations when i named this (hense "a" and "b"), but i'll try this out. sRp -- Scott Parish http://srparish.net/ -
Oct 28, 7:44 pm 2007
David Symonds
Re: [PATCH 6/7] include $PATH in generating list of comm ...
The nearest set theory operation would be "difference" (or "complement"); that does not require that the subtrahend is a subset of the minuend. Dave. -
Oct 29, 4:45 am 2007
Johannes Schindelin
Re: [PATCH 6/7] include $PATH in generating list of comm ...
Hi, Yes, I guessed that. But in that case, "subtract" is actively wrong, since you cannot guarantee (and indeed do not want to assume) that one is the subset of the other. Ciao, Dscho -
Oct 29, 4:30 am 2007
Scott R Parish
[PATCH 6/7] include $PATH in generating list of commands ...
Git had previously been using the $PATH for scripts--a previous patch moved exec'ed commands to also use the $PATH. For consistency "help -a" should also list commands in the $PATH. The main commands are still listed from the git_exec_path(), but the $PATH is walked and other git commands (probably extensions) are listed. Signed-off-by: Scott R Parish <srp@srparish.net> --- help.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 120 insertions(+), ...
Oct 28, 8:30 pm 2007
Miles Bader
Re: How to remove a specific hunk
M-x diff-mode <move to bad hunk> C-u C-c C-a -Miles -- Next to fried food, the South has suffered most from oratory. -- Walter Hines Page -
Oct 29, 12:03 am 2007
Catalin Marinas
Re: stg branch --create test v2.6.24-rc1 doesn't work
What version of StGIT are you using? You could try 'stg branch --create test v2.6.24-rc1^{commit} but I thought latest StGIT adds this by default. -- Catalin -
Oct 29, 10:11 am 2007
Pierre Habouzit
Re: [PATCH] Fix regression in fast-import.c due to strbufs.
Actually, I also was the one breaking it in the first place, but you're welcome :) --=20 =C2=B7O=C2=B7 Pierre Habouzit =C2=B7=C2=B7O madcoder@debia= n.org OOO http://www.madism.org
Oct 28, 11:29 pm 2007
Shun Kei Leung
Re: [PATCH] Fix regression in fast-import.c due to strbufs.
Hi Pierre, Thanks. You are the man! It works perfectly now. Regards, Kevin -
Oct 28, 7:59 pm 2007
Catalin Marinas
Re: stgit restrictions on patch names
It's not that we explicitly disallows "+" but I think I tried to avoid some wrong patch names but was too lazy to create a better regexp. I think the last one is the simplest to implement, while the second is nicer, I've never found the time to investigate it properly. -- Catalin -
Oct 29, 9:14 am 2007
Peter Karlsson
Re: How to run git-gui always in English?
Fine. "Send to repository", then. My point is that if "push" is a technical term, then it doesn't belong in the GUI, and if it isn't, then it should be translated like any other UI element. -- \\// Peter - http://www.softwolves.pp.se/ -
Oct 29, 5:58 am 2007
Linus Torvalds
Re: remote#branch
Sure, but "URL" in human-speak has nothing to do with an RFC. I dislike language-lawyerese. Why the hell do people think that human language should follow the RFC's? Git addresses look like URL's, and they act like URL's, but dammit, git isn't a web browser, and it's not interested in acting like one. And "standards" are only as good as they are useful. XML is a piece of crap despite being a standard because it makes no sense. Similarly, "URL quoting" is a piece of crap when _it_ ...
Oct 29, 3:57 pm 2007
Johannes Schindelin
Re: remote#branch
Hi, So all you're saying is: it is not possible. Well, discussion ended, I guess. Ciao, Dscho -
Oct 29, 11:32 am 2007
Jan Hudec
Re: remote#branch
If the branch names are not url-escaped, than the result is not an URL. Whi= ch is just ugly and confusing. If it looks like an URL, it should better be on= e. --=20 Jan 'Bulb' Hudec <bulb@ucw.cz>
Oct 29, 10:40 am 2007
Theodore Tso
Re: remote#branch
Well, the confusion is that we refer to things that look like "git://git.kernel.org/pub/scm/git/git.git" as if it were a URL. In fact, you did so yourself in the last paragraph above. "People who think that git URL's".... but in fact, whether or not Universal Resource Locators (URL's) in the RFC 3986 sense requires quoting doesn't matter whether or not they are web pages or not. If they are formal URL's in the sense of RFC 3986, it doesn't matter whether they are http URL's, or ldap URL's, ...
Oct 29, 2:49 pm 2007
Johannes Schindelin
Re: remote#branch
Hi, To be fair, there are uses for XML. On Halloween, for example. Sorry, could not resist, Dscho -
Oct 29, 4:49 pm 2007
Linus Torvalds
Re: remote#branch
Git remote names already aren't "url"s in the http sense. We say "master:some.host/file/goes here/without/any/stupid/web-escapes" for the ssh names, and the same goes for "file:///name here" etc. People who think that git URL's are web-pages had better wake up and smell the coffee. They aren't. They never were. They never *should* be. This whole argument is idiotic. The #branch format was a mistake of cogito. Cogito is dead. Get over it already. We have a format already, and it ...
Oct 29, 11:17 am 2007
previous daytodaynext day
October 28, 2007October 29, 2007October 30, 2007