* Re: [RFD] Git glossary: 'branch' and 'head' description
From: Linus Torvalds @ 2006-05-20 2:06 UTC (permalink / raw)
To: Daniel Barkalow; +Cc: Junio C Hamano, git
In-Reply-To: <Pine.LNX.4.64.0605192116360.6713@iabervon.org>
On Fri, 19 May 2006, Daniel Barkalow wrote:
>
> I guess I did forget that it sticks around. So you have to be doing
> something somewhat more complicated, like fetching the latest versions of
> multiple topic branches.
I actually don't think it's at all unlikely that I'd start using this.
I tend to work in "spurts", where I do one thing for a while, and then
merge several pull requests in fairly short order. So while I use
ORIG_HEAD a lot, I can certainly imagine myself using the "since 2 hours
ago" format too.
I'm not entirely sure about the syntax, though. It ends up being pretty
command-line-unfriendly. The "gitk ORIG_HEAD.." thing is fairly easy to
type, but typing
gitk 'master@{2 hours ago}'..
on a Finnish keyboard (yeah, that's what I still use) is "interesting",
since all of '@', '{' and '}' are complex characters (AltGr + '2', AltGr +
'7' and AltGr + '0' respectively), and you have to remember the quoting.
Not that I see any obvious better syntax. Although allowing a shorthand
like "@2.hours.ago" for "current branch, at given date" might help a
bit, at least that wouldn't need quoting:
gitk @2.hours.ago..
Linus
^ permalink raw reply
* Re: [PATCH] Implement git-quiltimport (take 2)
From: Eric W. Biederman @ 2006-05-20 2:42 UTC (permalink / raw)
To: Greg KH; +Cc: Junio C Hamano, git
In-Reply-To: <20060519235825.GA3289@kroah.com>
Greg KH <greg@kroah.com> writes:
> On Thu, May 18, 2006 at 04:48:26AM -0600, Eric W. Biederman wrote:
>>
>> Yes, a smaller patch series, that is what I meant.
>> Most quilt trees that I know about are small.
>
> $ quilt series | wc -l
> 207
>
> And that is about "normal" for me. Sometimes it grows to about 500+
> patches, but that only happens when there's a longer kernel release
> cycle.
>
> Another tree that I work on all the time is about 700+ patches, and yet
> another 2000+. So you might re-evaluate your statement about "small"
> quilt series :)
Sure. On fixing the upstream attribution issue you and Andi Kleen
look like people that are worth talking to, as there were several
patches in Andrews tree from both of you that were lacking attribution.
> In looking at your script, it doesn't seem to be able to handle patches
> in quilt that are in mbox format. Any thoughts to allow this to handle
> the attribution properly?
Mbox format but one patch per file, or multiple patches in one mbox file?
If it is one patch per file but with mbox headers, it is relatively
simple to teach git-mailinfo to parse things in a slightly more intelligent
way. I played with that but I didn't have any patches that helped with.
> Right now my development flow has me converting my quilt tree to one big
> mbox file and then using 'git applymbox' to import it before asking
> Linus to pull from it.
>
> With your script I could skip at least one step, which would save me
> some time...
Sure. That is the point of making it generic.
Eric
^ permalink raw reply
* Re: [RFC] qgit with tabs
From: Pavel Roskin @ 2006-05-20 9:42 UTC (permalink / raw)
To: Marco Costalba; +Cc: git
In-Reply-To: <e5bfff550605190954w4baab5fcj4f48a539bd120364@mail.gmail.com>
Quoting Marco Costalba <mcostalba@gmail.com>:
> > If I see the list of the recent patches, I see the descriptions and the
> > affected files. If I'm interested to see what changed in the file, it's
> > only natural for me to double-click the corresponding entry in the list.
> >
>
> Ok. patch pushed.
Working fine here. Thank you!
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: [PATCH] Document that "git add" only adds non-ignored files.
From: Santi @ 2006-05-20 9:54 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vfyj5ispx.fsf@assigned-by-dhcp.cox.net>
2006/5/19, Junio C Hamano <junkio@cox.net>:
> Thanks for the reminder, but I wonder if it is good to update
> the description of this command, and ls-files to use the
> same wording for consistency. We seem to use <pathspec> to mean
> "this is not necessarily a filename -- we glob", so that may be
> a good candidate (we do not have <pathspec> in glossary yet --
> we would need to add).
I changed it to match with the new usage string in the buildin-add.c.
>
> Please don't touch description for diff-* family -- right now,
> they say <path>, because they do not glob. If we decide that it
> is a good idea to glob (which I suspect we don't for the
> low-level stuff, but we probably do for the "git-diff" wrapper),
> we would update the code and the description at the same time.
>
OK.
Santi
^ permalink raw reply
* Re: [RFC] qgit with tabs
From: Paul Mackerras @ 2006-05-20 10:28 UTC (permalink / raw)
To: Marco Costalba; +Cc: Pavel Roskin, git
In-Reply-To: <e5bfff550605130431w417b8aacl2b17cf5655b46f31@mail.gmail.com>
Marco Costalba writes:
> FWIK gitk does not have a file content viewer.
It does now, actually.
Paul.
^ permalink raw reply
* Re: [RFC] qgit with tabs
From: Marco Costalba @ 2006-05-20 11:46 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Pavel Roskin, git
In-Reply-To: <17518.61262.957027.606886@cargo.ozlabs.ibm.com>
On 5/20/06, Paul Mackerras <paulus@samba.org> wrote:
> Marco Costalba writes:
>
> > FWIK gitk does not have a file content viewer.
>
> It does now, actually.
>
> Paul.
>
Yes, I've checked the current gitk version only _after_ email was sent.
Sorry for this.
Marco
^ permalink raw reply
* [BUG] "stg pull" on qgit tree shows problems, including git-http-fetch segfault
From: Yann Dirson @ 2006-05-20 12:58 UTC (permalink / raw)
To: GIT list
With "master" branch pointing to tags/qgit-1.2~17 and "origin" to
0a327c900530d9dd293cd252894a24913d4172c3, with no patch applied on
"master" stack, using stgit 0.9 and git 1.3.2:
$ stg pull
Pulling from "origin"...
Fetching refs/heads/master from http://digilander.libero.it/mcostalba/scm/qgit.git using http
got 5d0d2f1703976e04c6db1e55ea6a044981b9ed20
walk 5d0d2f1703976e04c6db1e55ea6a044981b9ed20
[...]
got 1f151284442358eee6da80394585491295c94380
error: File 24bd6f23c6d0161f7e775a0e6ab767725b6344ab (http://digilander.libero.it/mcostalba/scm/qgit.git/objects/f7/dc43059ca42dec2ea7214a33d1ff3c35e0aca5) corrupt
Getting pack list for http://digilander.libero.it/mcostalba/scm/qgit.git/
got 63dc5a19ec0ac37fec09e4023cd51a62eb3efa15
[...]
got 53563b4b6b32ba7ea184a4eeb555db76e276c8a6
error: XML error: syntax error
got 73c20d6d667ff3860718d5e1382e686531360082
[...]
got 0219d8723f9a4fa562d99eb0840741112a13466d
error: The requested URL returned error: 405
Getting alternates list for http://digilander.libero.it/mcostalba/scm/qgit.git/
got 33e3b252eb5dbe84116a858136b9b35fe43bf768
Also look at <meta http-equiv="Refresh" content="5;URL=http://digiland.libe
Also look at <BASE HREF="http://digiland.liber
/usr/bin/git-fetch: line 268: 3725 Segmentation fault git-http-fetch -v -a "$head" "$remote/"
stg pull: Failed "git-pull origin"
Running "stg pull" again gives only another "XML error", and finishes
the pull.
After unpacking all packs (mv .git/objects/pack and git-unpack-object
the contents) to be sure pruning does force everything to be
re-fetched, the following commands allow to reproduce the problem:
git-rev-parse tags/qgit-1.2~17 > .git/refs/heads/master
git-rev-parse tags/qgit-1.2~17 > .git/refs/bases/master
echo 0a327c900530d9dd293cd252894a24913d4172c3 >.git/refs/heads/origin
git-prune
cg-reset
stg pull
Output then reproducibly goes like the above, if one reruns the same
6 commands repeatedly, though the fetch order is not deterministic,
which may explain slight differences in the output.
Using current HEAD git instead of 1.3.2 does not improve things.
Best regards,
--
Yann Dirson <ydirson@altern.org> |
Debian-related: <dirson@debian.org> | Support Debian GNU/Linux:
| Freedom, Power, Stability, Gratis
http://ydirson.free.fr/ | Check <http://www.debian.org/>
^ permalink raw reply
* Re: [BUG] "stg pull" on qgit tree shows problems, including git-http-fetch segfault
From: Yann Dirson @ 2006-05-20 13:12 UTC (permalink / raw)
To: GIT list
In-Reply-To: <20060520125804.GG6535@nowhere.earth>
Let's be more precise - the command that repedetly fails is the
following. It is reponsible for both the "XML error" message and the
segfault.
git-http-fetch -v -a 79ac640b3129344d4e94573ddaea09ccda1b8e3b http://digilander.libero.it/mcostalba/scm/qgit.git/
Output goes like:
walk 79ac640b3129344d4e94573ddaea09ccda1b8e3b
walk d8bc846d8d2709fa240887da512e8b125a669006
walk 5d0d2f1703976e04c6db1e55ea6a044981b9ed20
error: File f7dc43059ca42dec2ea7214a33d1ff3c35e0aca5 (http://digilander.libero.it/mcostalba/scm/qgit.git/objects/f7/dc43059ca42dec2ea7214a33d1ff3c35e0aca5) corrupt
Getting pack list for http://digilander.libero.it/mcostalba/scm/qgit.git/
error: XML error: syntax error
Getting index for pack c47999034002469dddee39ba0069c1b1a84487a5
error: Unable to open local file .git/objects/pack/pack-c47999034002469dddee39ba0069c1b1a84487a5.idx for pack index
Getting alternates list for http://digilander.libero.it/mcostalba/scm/qgit.git/
Also look at <meta http-equiv="Refresh" content="5;URL=http://digiland.libe
Also look at <BASE HREF="http://digiland.liber
Segmentation fault (core dumped)
gdb backtrace is:
#0 0xb7caa5d0 in strncpy () from /lib/tls/libc.so.6
#1 0x0804c177 in process_alternates_response (callback_data=0xbfd428ec) at http-fetch.c:587
#2 0x0804a6c8 in process_curl_messages () at http.c:461
#3 0x0804a773 in step_active_slots () at http.c:379
#4 0x0804a7c7 in run_active_slot (slot=0x807f6a8) at http.c:400
#5 0x0804c565 in fetch_alternates (base=0xbfd45424 "http://digilander.libero.it/mcostalba/scm/qgit.git/") at http-fetch.c:668
#6 0x0804d46c in fetch (sha1=0x807f448 "÷ÜC\005\234¤-ì.§!J3Ñÿ<5ଥ\225¹\005\b") at http-fetch.c:1131
#7 0x0804a1ad in pull (target=0xbfd453fb "79ac640b3129344d4e94573ddaea09ccda1b8e3b") at fetch.c:168
#8 0x0804b590 in main (argc=5, argv=0xbfd43af4) at http-fetch.c:1269
The crash in process_alternates_response occurs on line:
587 strncpy(target + serverlen, data + i,
588 posn - i - 7);
(gdb) p target
$1 = 0x80800b8 "http://digilander.libero.it//-->\n</script>\n\n<script language=\"Javascript\" src=\"/x/js/nu05.js\"></script>\n\n<script>\n<!--\n\nfunction loaded() {\n\tcommon_boot();\n\t\n\t\t\n}\n\nfunction unloaded() {\n\tcommon_unload"...
(gdb) p target+serverlen
$2 = 0x80800d3 "//-->\n</script>\n\n<script language=\"Javascript\" src=\"/x/js/nu05.js\"></script>\n\n<script>\n<!--\n\nfunction loaded() {\n\tcommon_boot();\n\t\n\t\t\n}\n\nfunction unloaded() {\n\tcommon_unload();\n\t}\n\nfunction eoc() {\n\tc"...
(gdb) p data
$3 = 0x809c840 ""
(gdb) p i
$4 = 134739640
(gdb) p posn
$5 = 1304
Looks like something is going very wrong, like wrong assumptions about received HTML.
--
Yann Dirson <ydirson@altern.org> |
Debian-related: <dirson@debian.org> | Support Debian GNU/Linux:
| Freedom, Power, Stability, Gratis
http://ydirson.free.fr/ | Check <http://www.debian.org/>
^ permalink raw reply
* [PATCH] fmt-patch: Support --attach
From: Johannes Schindelin @ 2006-05-20 13:40 UTC (permalink / raw)
To: git, junkio
This patch touches a couple of files, because it adds options to print a
custom text just after the subject of a commit, and just after the
diffstat.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
Maybe it would be a good idea to store the options to
pretty_print_commit() in a struct...
Also, I realized that it might be necessary to check the commit
message for a single "." in a line, since that has special meaning
in emails.
builtin-log.c | 13 ++++++++++---
builtin-rev-list.c | 2 +-
commit.c | 10 +++++++++-
commit.h | 2 +-
diff.c | 5 ++++-
diff.h | 1 +
log-tree.c | 35 +++++++++++++++++++++++++++++++----
revision.h | 1 +
show-branch.c | 2 +-
9 files changed, 59 insertions(+), 12 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index 12a6d19..a30e974 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -183,7 +183,9 @@ int cmd_format_patch(int argc, const cha
argv[i + 1]);
output_directory = strdup(argv[i + 1]);
i++;
- } else
+ } else if (!strcmp(argv[i], "--attach"))
+ rev.mime_boundary = "050802040500080604070107";
+ else
argv[j++] = argv[i];
}
argc = j;
@@ -224,8 +226,13 @@ int cmd_format_patch(int argc, const cha
shown = log_tree_commit(&rev, commit);
free(commit->buffer);
commit->buffer = NULL;
- if (shown)
- printf("-- \n%s\n\n", git_version_string);
+ if (shown) {
+ if (rev.mime_boundary)
+ printf("\n--------------%s--\n\n\n",
+ rev.mime_boundary);
+ else
+ printf("-- \n%s\n\n", git_version_string);
+ }
if (!use_stdout)
fclose(stdout);
}
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 6a2e874..78b9c23 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -84,7 +84,7 @@ static void show_commit(struct commit *c
static char pretty_header[16384];
pretty_print_commit(revs.commit_format, commit, ~0,
pretty_header, sizeof(pretty_header),
- revs.abbrev, NULL);
+ revs.abbrev, NULL, NULL);
printf("%s%c", pretty_header, hdr_termination);
}
fflush(stdout);
diff --git a/commit.c b/commit.c
index 84558ba..0b163d4 100644
--- a/commit.c
+++ b/commit.c
@@ -498,7 +498,7 @@ static int add_merge_info(enum cmit_fmt
return offset;
}
-unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject)
+unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject)
{
int hdr = 1, body = 0;
unsigned long offset = 0;
@@ -591,6 +591,14 @@ unsigned long pretty_print_commit(enum c
buf[offset++] = '\n';
if (fmt == CMIT_FMT_ONELINE)
break;
+ if (after_subject) {
+ int slen = strlen(after_subject);
+ if (slen > space - offset - 1)
+ slen = space - offset - 1;
+ memcpy(buf + offset, after_subject, slen);
+ offset += slen;
+ after_subject = NULL;
+ }
subject = NULL;
}
while (offset && isspace(buf[offset-1]))
diff --git a/commit.h b/commit.h
index 8d7514c..c9de167 100644
--- a/commit.h
+++ b/commit.h
@@ -51,7 +51,7 @@ enum cmit_fmt {
};
extern enum cmit_fmt get_commit_format(const char *arg);
-extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject);
+extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject);
/** Removes the first commit from a list sorted by date, and adds all
* of its parents.
diff --git a/diff.c b/diff.c
index e16e0bf..3e2828b 100644
--- a/diff.c
+++ b/diff.c
@@ -1867,7 +1867,10 @@ void diff_flush(struct diff_options *opt
show_stats(diffstat);
free(diffstat);
diffstat = NULL;
- putchar(options->line_termination);
+ if (options->stat_sep)
+ fputs(options->stat_sep, stdout);
+ else
+ putchar(options->line_termination);
}
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
diff --git a/diff.h b/diff.h
index 7410607..83619eb 100644
--- a/diff.h
+++ b/diff.h
@@ -44,6 +44,7 @@ struct diff_options {
int rename_limit;
int setup;
int abbrev;
+ const char *stat_sep;
int nr_paths;
const char **paths;
diff --git a/log-tree.c b/log-tree.c
index 526d578..7f0f54b 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -20,7 +20,7 @@ void show_log(struct rev_info *opt, stru
int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
const char *extra;
int len;
- char* subject = NULL;
+ char *subject = NULL, *after_subject = NULL;
opt->loginfo = NULL;
if (!opt->verbose_header) {
@@ -52,6 +52,7 @@ void show_log(struct rev_info *opt, stru
*/
if (opt->commit_format == CMIT_FMT_EMAIL) {
+ char *sha1 = sha1_to_hex(commit->object.sha1);
if (opt->total > 0) {
static char buffer[64];
snprintf(buffer, sizeof(buffer),
@@ -63,8 +64,34 @@ void show_log(struct rev_info *opt, stru
else
subject = "Subject: ";
- printf("From %s Thu Apr 7 15:13:13 2005\n",
- sha1_to_hex(commit->object.sha1));
+ printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
+ if (opt->mime_boundary) {
+ static char subject_buffer[1024];
+ static char buffer[1024];
+ snprintf(subject_buffer, sizeof(subject_buffer) - 1,
+ "MIME-Version: 1.0\n"
+ "Content-Type: multipart/mixed;\n"
+ " boundary=\"------------%s\"\n"
+ "\n"
+ "This is a multi-part message in MIME "
+ "format.\n"
+ "--------------%s\n"
+ "Content-Type: text/plain; "
+ "charset=UTF-8; format=fixed\n"
+ "Content-Transfer-Encoding: 8bit\n\n",
+ opt->mime_boundary, opt->mime_boundary);
+ after_subject = subject_buffer;
+
+ snprintf(buffer, sizeof(buffer) - 1,
+ "--------------%s\n"
+ "Content-Type: text/x-patch;\n"
+ " name=\"%s.diff\"\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Content-Disposition: inline;\n"
+ " filename=\"%s.diff\"\n\n",
+ opt->mime_boundary, sha1, sha1);
+ opt->diffopt.stat_sep = buffer;
+ }
} else {
printf("%s%s",
opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
@@ -81,7 +108,7 @@ void show_log(struct rev_info *opt, stru
/*
* And then the pretty-printed message itself
*/
- len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject);
+ len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, after_subject);
printf("%s%s%s", this_header, extra, sep);
}
diff --git a/revision.h b/revision.h
index 62759f7..bdbdd23 100644
--- a/revision.h
+++ b/revision.h
@@ -59,6 +59,7 @@ struct rev_info {
enum cmit_fmt commit_format;
struct log_info *loginfo;
int nr, total;
+ const char *mime_boundary;
/* special limits */
int max_count;
diff --git a/show-branch.c b/show-branch.c
index bbe26c2..684ffd1 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -259,7 +259,7 @@ static void show_one_commit(struct commi
struct commit_name *name = commit->object.util;
if (commit->object.parsed)
pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
- pretty, sizeof(pretty), 0, NULL);
+ pretty, sizeof(pretty), 0, NULL, NULL);
else
strcpy(pretty, "(unavailable)");
if (!strncmp(pretty, "[PATCH] ", 8))
--
1.3.3.gea94-dirty
^ permalink raw reply related
* Re: [PATCH] fmt-patch: Support --attach
From: Jakub Narebski @ 2006-05-20 14:16 UTC (permalink / raw)
To: git
In-Reply-To: <Pine.LNX.4.63.0605201537290.17869@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin wrote:
> - printf("From %s Thu Apr 7 15:13:13 2005\n",
> - sha1_to_hex(commit->object.sha1));
> + printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
What's with the date?
--
Jakub Narebski
Warsaw, Poland
^ permalink raw reply
* Re: [BUG] "stg pull" on qgit tree shows problems, including git-http-fetch segfault
From: Marco Costalba @ 2006-05-20 14:26 UTC (permalink / raw)
To: Yann Dirson; +Cc: GIT list
In-Reply-To: <20060520125804.GG6535@nowhere.earth>
On 5/20/06, Yann Dirson <ydirson@altern.org> wrote:
> With "master" branch pointing to tags/qgit-1.2~17 and "origin" to
> 0a327c900530d9dd293cd252894a24913d4172c3, with no patch applied on
> "master" stack, using stgit 0.9 and git 1.3.2:
>
Please reclone qgit repo and try again.
The public repository was broken by a my mistake few days ago. So you
need to reclone.
Thanks
Marco
^ permalink raw reply
* Re: [PATCH] include header to define uint32_t, necessary on Mac OS X
From: Alex Riesen @ 2006-05-20 14:41 UTC (permalink / raw)
To: Ben Clifford; +Cc: Junio C Hamano, Linus Torvalds, Dennis Stosberg, git
In-Reply-To: <Pine.LNX.4.64.0605142057220.10680@mundungus.clifford.ac>
Ben Clifford, Sun, May 14, 2006 22:58:33 +0200:
> From: Ben Clifford <benc@hawaga.org.uk>
> Date: Sun, 14 May 2006 21:34:56 +0100
> Subject: [PATCH] include header to define uint32_t, necessary on Mac OS X
>
> ---
>
> pack-objects.c | 1 +
> sha1_file.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> 2ee926ab9da67ef2a6ca28bb70954a33d65ba466
> diff --git a/pack-objects.c b/pack-objects.c
> index 1b9e7a1..5466b15 100644
> --- a/pack-objects.c
> +++ b/pack-objects.c
> @@ -10,6 +10,7 @@ #include "csum-file.h"
> #include "tree-walk.h"
> #include <sys/time.h>
> #include <signal.h>
> +#include <stdint.h>
>
BTW, Ben, how did you produce this patch? It has some unusual
indentations...
^ permalink raw reply
* Re: gitk highlight feature
From: Linus Torvalds @ 2006-05-20 16:42 UTC (permalink / raw)
To: Paul Mackerras; +Cc: git
In-Reply-To: <17518.24000.952384.563448@cargo.ozlabs.ibm.com>
On Sat, 20 May 2006, Paul Mackerras wrote:
>
> I just pushed some changes to the "new" branch of the gitk.git
> repository which change the way we do highlighting. There is now a
> row of controls across the middle of the window, just below the row
> containing the sha1 ID, "Find" button, etc., which controls the
> highlighting.
Ok, this is much nicer, I think this ends up being much closer to what I
really wanted, even if I didn't know quite how I wanted it.
I think the "Find" field should highlight things too. Right now there's no
way to get highlighting for somebody having signed-off on a patch, for
example, even though you can _search_ for it.
Also, right now it says "Author/committer", but it actually only triggers
on author. Which may be the right thing to do (it's certainly what I'd
normally want to see), but it doesn't match the description.
Linus
^ permalink raw reply
* Re: [PATCH] include header to define uint32_t, necessary on Mac OS X
From: Linus Torvalds @ 2006-05-20 16:50 UTC (permalink / raw)
To: Alex Riesen; +Cc: Ben Clifford, Junio C Hamano, Dennis Stosberg, git
In-Reply-To: <20060520144111.GA5798@steel.home>
On Sat, 20 May 2006, Alex Riesen wrote:
> Ben Clifford, Sun, May 14, 2006 22:58:33 +0200:
> > #include <sys/time.h>
> > #include <signal.h>
> > +#include <stdint.h>
> >
>
> BTW, Ben, how did you produce this patch? It has some unusual
> indentations...
I don't think it's the patch producer. It's some mail-mangler. Some broken
mailers seem to add an extra space at the beginning of a line that already
begins with a space - I've seen this before.
The headers would seem to say "Pine":
Message-ID: <Pine.LNX.4.64.0605142057220.10680@mundungus.clifford.ac>
but that makes no sense, because mine certainly doesn't. But pine does
have a few config options to mangle whitespace, so who knows..
It could also be the actual send path, of course.
Linus
^ permalink raw reply
* Re: [PATCH] fmt-patch: Support --attach
From: Johannes Schindelin @ 2006-05-20 17:10 UTC (permalink / raw)
To: Jakub Narebski; +Cc: git
In-Reply-To: <e4n8b3$ari$1@sea.gmane.org>
Hi,
On Sat, 20 May 2006, Jakub Narebski wrote:
> Johannes Schindelin wrote:
>
> > - printf("From %s Thu Apr 7 15:13:13 2005\n",
> > - sha1_to_hex(commit->object.sha1));
> > + printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
>
> What's with the date?
Does not matter. This is not part of the mail header (the date is
displayed as a "Date:" line).
I only changed the "From " line (note the missing ":") to match the output
from git-format-patch.sh.
Ciao,
Dscho
^ permalink raw reply
* irc usage..
From: Linus Torvalds @ 2006-05-20 17:26 UTC (permalink / raw)
To: Git Mailing List
I hate irc.
I'm reading the irc logs, and seeing that people have problems, but (a) it
was while I was asleep and (b) irc use doesn't encourage people to
actually explain what the problems _are_, so I have no clue.
So now I know that "spyderous" has problems importing some 1GB gentoo CVS
archive, but that's pretty much it. Grr.
Are people afraid to post to git@vger.kernel.org, or what?
I saw that people tried to suggest posting to the git mailing list, but
can any of you who are active on irc be a bit more forceful? And perhaps
we don't make this mailing list address well enough known?
As far as I'm aware, the git mailing list isn't closed, so people should
be able to post here without even subscribing. I can well understand that
you might not want to subscribe and prefer to look ove rthe list through
some archive setup (the way I look at the irc logs), and maybe we should
just make the git mailing list address more obvious.
Right now, the "community" page at http://git.or.cz/community.html doesn't
even mention the git mailing list address directly, it just tells you how
you can subscribe and read the archives.
Can we perhaps fix that, and the people who are active on irc please also
make it clear to people that if they have some real problems that don't
get an immediate answer, the git mailing list ends up where a lot of
people can actually look more closely at it.. And tell them what the
address is.
Linus
^ permalink raw reply
* Re: [PATCH] fmt-patch: Support --attach
From: Junio C Hamano @ 2006-05-20 17:43 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <Pine.LNX.4.63.0605201904320.31887@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> I only changed the "From " line (note the missing ":") to match the output
> from git-format-patch.sh.
Not a big deal, but I was hoping you would keep the inception
date of git (April one) in the final version ;-). The September
date is totally a random date and does not have any
significance.
Anyway, with this change (and a lot of testing ;-) I think we
can replace the script with built-in. Thanks.
^ permalink raw reply
* Re: irc usage..
From: Junio C Hamano @ 2006-05-20 17:50 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
In-Reply-To: <Pine.LNX.4.64.0605201016090.10823@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> I hate irc.
>...
> Can we perhaps fix that, and the people who are active on irc please also
> make it clear to people that if they have some real problems that don't
> get an immediate answer, the git mailing list ends up where a lot of
> people can actually look more closely at it.. And tell them what the
> address is.
I hate irc, too. Number of times easily solvable usage problems
come up and I look at the log to realize when the solutions
suggested were waaaaay suboptimal it is too late (with loops
being quite active recently things have improved a lot, but we
should not expect him to be 24/7).
Maybe somebody can run a dumb 'bot that notices somebody said
something that ends with a '?' and there is no activity there
for N minutes and inject a recorded message that reminds the
mailing list address ;-).
^ permalink raw reply
* Re: [PATCH] fmt-patch: Support --attach
From: Johannes Schindelin @ 2006-05-20 17:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7v4pzk3831.fsf@assigned-by-dhcp.cox.net>
Hi,
On Sat, 20 May 2006, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > I only changed the "From " line (note the missing ":") to match the output
> > from git-format-patch.sh.
>
> Not a big deal, but I was hoping you would keep the inception
> date of git (April one) in the final version ;-). The September
> date is totally a random date and does not have any
> significance.
Actually, I just tested something: pine seems to be confused when parsing
a "From " line where the day of month is only one digit without two
leading digits. I don't care.
> Anyway, with this change (and a lot of testing ;-) I think we
> can replace the script with built-in. Thanks.
There are two options missing: --signoff and --check.
--signoff is my fault: it is probably a good thing to drop it from
format-patch, and only leave it in applymbox.
As for --check: how about having yet another diff "format":
DIFF_FORMAT_CHECK? Instead of showing the diff, it only shows the line(s)
which are offending.
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH] fmt-patch: Support --attach
From: Junio C Hamano @ 2006-05-20 18:00 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <Pine.LNX.4.63.0605201945110.32590@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Sat, 20 May 2006, Junio C Hamano wrote:
>
>> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> There are two options missing: --signoff and --check.
>
> --signoff is my fault: it is probably a good thing to drop it from
> format-patch, and only leave it in applymbox.
I think that is fine. format-patch only formats existing
commits, and if you are signing off something you could already
have done that when you made the commits anyway, so that flag
was redundant.
> As for --check: how about having yet another diff "format":
> DIFF_FORMAT_CHECK? Instead of showing the diff, it only shows the line(s)
> which are offending.
Never thought of that but I think it makes sense.
I liked the way Sean did the --summary; I am wondering if we
could clean up the --with-* stuff in a similar way. We
currently do "if DIFF_FORMAT_XYZ or with_xyz then do this" which
is quite honestly disgusting (my fault).
^ permalink raw reply
* Segfaults with USE_CURL_MULTI
From: Florian Weimer @ 2006-05-20 18:47 UTC (permalink / raw)
To: git
Is anybody else seeing segfaults on dumb HTTP pull with
USE_CURL_MULTI? For example, this crashes for me:
$ git clone http://git.enyo.de/fw/debian/debfoster.git upstream
GDB shows that this happens inside the call to curl_multi_perform.
^ permalink raw reply
* Re: irc usage..
From: Jakub Narebski @ 2006-05-20 18:52 UTC (permalink / raw)
To: git
In-Reply-To: <7vzmhc1t70.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> Maybe somebody can run a dumb 'bot that notices somebody said
> something that ends with a '?' and there is no activity there
> for N minutes and inject a recorded message that reminds the
> mailing list address ;-).
Or something like fsbot or other bots on #emacs channel
http://www.emacswiki.org/cgi-bin/wiki/EmacsChannel
--
Jakub Narebski
Warsaw, Poland
^ permalink raw reply
* Re: [PATCH] fmt-patch: Support --attach
From: Johannes Schindelin @ 2006-05-20 20:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vu07k1sr8.fsf@assigned-by-dhcp.cox.net>
Hi,
On Sat, 20 May 2006, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Sat, 20 May 2006, Junio C Hamano wrote:
> >
> > As for --check: how about having yet another diff "format":
> > DIFF_FORMAT_CHECK? Instead of showing the diff, it only shows the line(s)
> > which are offending.
>
> Never thought of that but I think it makes sense.
>
> I liked the way Sean did the --summary; I am wondering if we
> could clean up the --with-* stuff in a similar way. We
> currently do "if DIFF_FORMAT_XYZ or with_xyz then do this" which
> is quite honestly disgusting (my fault).
I do not think the --with-* stuff can be done in a similar way. If I do
"git log --summary -p", I do not get a summary. The only way to "clean it
up" would be to add a linked list of diff_formats (to preserve the order).
But frankly, I think that is overkill. After all, how often have you
dreamt about showing first the patch, then the summary, and maybe a
diffstat, and after that the patch again, for each commit?
Ciao,
Dscho
^ permalink raw reply
* Re: irc usage..
From: Yann Dirson @ 2006-05-20 20:39 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Git Mailing List
In-Reply-To: <Pine.LNX.4.64.0605201016090.10823@g5.osdl.org>
On Sat, May 20, 2006 at 10:26:22AM -0700, Linus Torvalds wrote:
> I'm reading the irc logs, and seeing that people have problems, but (a) it
> was while I was asleep and (b) irc use doesn't encourage people to
> actually explain what the problems _are_, so I have no clue.
>
> So now I know that "spyderous" has problems importing some 1GB gentoo CVS
> archive, but that's pretty much it. Grr.
FWIW, I have mentionned a problem that may be the same, under
Message-ID <20060107090148.GB32585@nowhere.earth>, that was on January
7th. Namely, when importing a repository with very large files over
pserver or ssh, timeouts can occur and prevent the import from
working. But, as you said, it's not easy to get precise info from the
logs :)
Best regards,
--
Yann Dirson <ydirson@altern.org> |
Debian-related: <dirson@debian.org> | Support Debian GNU/Linux:
| Freedom, Power, Stability, Gratis
http://ydirson.free.fr/ | Check <http://www.debian.org/>
^ permalink raw reply
* [PATCH] Document that diff/diff-tree accept any number of trees.
From: Santi @ 2006-05-20 20:51 UTC (permalink / raw)
To: git, Junio C Hamano
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
b98780e10df65bf9b37b4368d97bac53b5371170
Documentation/git-diff-tree.txt | 5 ++++-
Documentation/git-diff.txt | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
b98780e10df65bf9b37b4368d97bac53b5371170
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 906830d..3141ad8 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -11,7 +11,7 @@ SYNOPSIS
[verse]
'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
[-t] [-r] [-c | --cc] [--root] [<common diff options>]
- <tree-ish> [<tree-ish>] [<path>...]
+ <tree-ish>... [<path>...]
DESCRIPTION
-----------
@@ -20,6 +20,9 @@ Compares the content and mode of the blo
If there is only one <tree-ish> given, the commit is compared with its parents
(see --stdin below).
+If three or more <tree-ish> are given, it shows the differences from each of
+the <tree-ish> to the first one simultaneously (see -c below).
+
Note that "git-diff-tree" can use the tree encapsulated in a commit object.
OPTIONS
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 7267bcd..1842d7a 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -8,7 +8,7 @@ git-diff - Show changes between commits,
SYNOPSIS
--------
-'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
+'git-diff' [ --diff-options ] [<ent>...] [<path>...]
DESCRIPTION
-----------
@@ -25,7 +25,7 @@ the number of ents given to the command.
`--cached` can be given to compare the index file and
the named tree.
-* When two <ent>s are given, these two trees are compared
+* When two or more <ent>s are given, these trees are compared
using `git-diff-tree`.
OPTIONS
--
1.3.3.g5b1bb
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox