The more I think about this, if we were to add yet another command, I think it should be a command that lets us inspect ref-log. We do not have an UI other than @{time} syntax to interact with it right now. What are the things we would want? Here is a strawman. - List when and how a branch was changed. git ref-log --list --type=merge next (when did I merge into my 'next'?) git ref-log --list --type=merge (ditto but any branches) git ref-log --list next (any changes not just ...

Instead of providing the project as a ?p= parameter it is simply appended to the base URI. All other parameters are appended to that, except for ?a=summary which is the default and can be omitted. Signed-off-by: Martin Waitz <tali@admingilde.org> --- gitweb/gitweb.perl | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 597d29f..e507ce9 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -355,6 ...

Hi, when I try fetching from kernel.org, I get fatal: read error (Connection reset by peer) Fetch failure: git://git.kernel.org/pub/scm/git/git.git all the time. Fetching by HTTP instead of git protocol works fine, though. What is happening? Ciao, Dscho -

Hi *, this patchset includes: fetch: Reset remote refs list each time fetch_main is called fetch & co: Use "hash1..hash2" instead of "from hash1 to hash2" fetch & co: Use short sha1 in the output fetch: Add output for the not fast forward case fetch: Clean output The first one is actually a bugfix (at least for me), but needed for the last one. git-fetch.sh | 19 ++++++++++++++----- git-merge.sh | 2 +- git-resolve.sh | 2 +- 3 files ...

2006/9/29, A Large Angry SCM <gitzilla@gmail.com>: > Santi B

Santi B

Do not show duplicated remote branch information and reformat the output as: $ git fetch -v # the committish lines for the -v. * refs/heads/origin: fast forward to remote branch 'master' of ../git/ 1ad7a06..bc1a580 committish: bc1a580 * refs/heads/pu: does not fast forward to remote branch 'pu' of ../git/; 7c733a8...5faa935 not updating. forcing update. committish: 5faa935 * refs/heads/next: same as remote branch 'origin/next' of ../git/ committish: ce47b9f ... * ...

On Fri, 29 Sep 2006 13:37:36 -0400 It was just a single example, one maybe not important to you. In fact it might be interesting to someone who isn't even running _any_ Linux kernel themselves; a security researcher or journalist for instance. There are other examples as well. Maybe none of them would apply to your needs, but there are people who would find it interesting and convenient. Sean -

In tree view, by default, hash_base is HEAD and hash is the entry equivalent. Else the user had selected a hash_base or hash, say by clicking on a revision or commit, in which case those values are used. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> --- gitweb/gitweb.perl | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

Hello, I just released cogito-0.18 - new feature release of the Cogito user-friendly Git user interface. The biggest highlights are super-duper cg-log, tagging interface and cg-patch -m. Contrary to my plan, this unfortunately does NOT contain three big things yet that are missing but will be in cogito-0.19 (which should be already quite near the ever-approaching version 1.0): - Rigorous three-way merging of uncommitted local changes instead of stashing local changes in patches ...

This is a current git bug (and git bug ever since it started to say "dissimilarity index"). Thanks for noticing, and very sorry for the trouble. It seems that a complete rewrite diff never worked and nobody seriously looked at them. This should fix it. -- >8 -- [PATCH] git-diff -B output fix. Geert noticed that complete rewrite diff missed the usual a/ and b/ leading paths. Pickaxe says it never worked, ever. Embarrassing. Signed-off-by: Junio C Hamano <junkio@cox.net> --- ...

Hi, I see that you care deeply about the 7 column example. In that case, yes, I would rather have columns be rounded down to the next even number. I care more about the consistency: if there are changes, I want to see them, and it should be linear: the more changes, the more plusses or minusses. Ciao, Dscho P.S.: here's a patch on top of my last one: -- snip -- [PATCH] force even diffstat width Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> --- diff.c | 3 ...

I think 12pm is correct, but 12am probably isn't (12am should _subtract_ 12, while 12pm does _not_ add 12). That said, I have a rice cooker that avoids the problem by saying "0:10 PM" for ten minutes past midday ;) Of course, all sane and civilized countries just use 24-hour format anyway. "Military time" my *ss. Some day the US will turn metric and 24-hour-format. If the sun doesn't turn into a red giant first, that is. Linus -

Here's a patch that should work. It just simplifies the whole thing to say "hour = (hour % 12) + X" where X is 12 for PM and 0 for AM. It also fixes the "exact date" parsing, which didn't parse AM at all, and as such would do the same "12:30 AM" means "12:30 24-hour-format" bug. Of course, I hope that no exact dates use AM/PM anyway, but since we support the PM format, let's just get it right. Not hugely tested, but I did test some of it, and it all _looks_ ...

But you have "if (hour > 0 && hour < 12)" in both am and pm so You are referring to the US, but neither is Japan sane nor civilized ;-). -

Why not just take the stupid and simple solution and make it: file1 | +31,-19 +++ file2 | +19,-106 --- file3 | +10,-10 ### That is, show the number of lines that actually changed, and print a fixed number of plusses or minuses after the numbers to make it easy to, at a glance, check if more lines were added than deleted or vice versa. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 ...

quoting myself... || * The 'next' branch, in addition, has these. I think the ones || marked with + could be 1.4.3-rc1 material: -

I phrased that badly. IF C pointer conversion allowed implicit addition of "const" past the top-most level, ANSI C would have just done "strtoul()" as unsigned long strtoul(const char *n, const char **p, int); ie they could just have added the "const" not just to the first argument, and legact programs (without const) would still have worked fine. But _because_ that's not how C type rules work, we have the current situation where the first argument is a "const char *", and the ...

This is simply too clever; -pedantic does not like assignment of arg to end (constness -- and strtoul takes pointer to non-const char *, so making the type of end const char * is not an answer either). And I do not like casting constness away: end = (char *) arg. Hmmmm. -

It is planned to add reflog support (view) to gitweb. But of course the repository that is under gitweb has to have reflog _enabled_ to be able to view it. -- Jakub Narebski Poland -

Hi, It is called git-browser, and was done by Artem Khodush. See http://straytree.com/. I asked Artem what the plans are, since some features are not yet implemented, but he said that the thing is too slow, and he'll probably not continue to work on it. Ciao, Dscho -

Ah well. I hope he keeps that page running though, and I hope the "time-is-importan" people find it. For reference, it gives a crude (and indeed slow) picture of what gitk and qgit does. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 -

We already do have a hash_base context. It is what allows us to "select" a revision from shortlog and ask "tree", "history", etc from there on, having set "h" and/or "hb". What this patch does is simply set "h" and/or "hb" to the string "HEAD" instead of the string "<SHA1 of HEAD>" when h/hb is not defined. -

No objections from me --- rather lack of objections from Jakub ;-) But the fragments do not appear to apply anymore. @@ -1625,7 +1625,7 @@ sub git_print_tree_entry { "history"); } print " | " . - $cgi->a({-href => href(action=>"blob_plain", hash_base=>"HEAD", + $cgi->a({-href => href(action=>"blob_plain", hash_base=>$hash_base, file_name=>"$basedir$t->{'name'}")}, "raw"); print "</td>\n"; There is no call to create blob_plain link with ...

Any comments on this? Possible comments :D - No comments - Not interested - Not interesting - I like the idea but not the patch because... - I like the patch but not the idea (?) - Broken syntax. Could be done in this other way... - Stop all this crazy things, just config all this manually! - Start more crazy things, like... - ... Santi -

Please do not do more than one patch per e-mail; I'll have to save the attachment in separate files and manually make commits, which is more work. The build procedure for the release to build rpms runs testsuite as part of it, so I need to think a bit how to proceed with this patch. Leaving the test failing on FC5 means I won't be able to cut binary releases. Checking early in the test script to see if "patch" can grok a diff for a file with whitespaces, and skipping the whitespace test if ...