* Re: git-cvsimport doesn't quite work, wrt branches
From: Linus Torvalds @ 2006-06-13 17:20 UTC (permalink / raw)
To: Jim Meyering
Cc: Git Mailing List, Matthias Urlichs, Yann Dirson, Pavel Roskin
In-Reply-To: <87irn5ovn6.fsf@rho.meyering.net>
On Tue, 13 Jun 2006, Jim Meyering wrote:
>
> Here's a test case that shows how git-cvsimport is misbehaving.
> The script below demonstrates the problem with git-1.3.3 as
> well as with 1.4.0.rc2.g5e3a6. As for cvsps, I'm using version 2.1.
Well, it's a cvsps problem.
Big surprise.
Sadly, it also seems to be one that isn't fixed by the patches _I_ have,
and looking at Yann's set of patches, I don't think they fix it either.
This is what (my version of) CVSps reports for your repository:
---------------------
PatchSet 1
Date: 2006/06/13 10:06:42
Author: torvalds
Branch: HEAD
Tag: (none)
Log:
.
Members:
on-br:INITIAL->1.1
on-trunk:INITIAL->1.1
---------------------
PatchSet 2
Date: 2006/06/13 10:06:44
Author: torvalds
Branch: B
Ancestor branch: HEAD
Tag: (none)
Log:
.
Members:
on-br:1.1->1.1.2.1
---------------------
PatchSet 3
Date: 2006/06/13 10:06:46
Author: torvalds
Branch: HEAD
Tag: (none)
Log:
.
Members:
on-br:1.1->1.2(DEAD)
and note how the "on-br" file is part of the initial PatchSet 1.
So CVSps basically tells git-cvsimport that commit 2 (on branch B) is
based on commit 1, and doesn't say that "on-trunk" has gone away, so the
resulting git repository has branch B containing "on-trunk" version 1.1,
and "on-br" version 1.1.2.1.
CVS branches obviously sometimes confuse CVSps. Sadly, they also confuse
_me_, so I don't see how to fix this particular CVSps bug, because I'm as
confused as CVSps is ;)
We'd need to have CVSps tell git that the "on-trunk" file was never added
to branch B: the simplest way to do that would be to say that it has
become (DEAD) in PatchSet 2 (which is not technically true in CVS terms,
but _is_ technically true on git terms - on branch B, that file is
obviously dead).
Yann? Pavel? Anybody? Ideas?
Linus
^ permalink raw reply
* Re: git-cvsimport doesn't quite work, wrt branches
From: Jakub Narebski @ 2006-06-13 17:06 UTC (permalink / raw)
To: git
In-Reply-To: <87irn5ovn6.fsf@rho.meyering.net>
Jim Meyering wrote:
> Here's a test case that shows how git-cvsimport is misbehaving.
> The script below demonstrates the problem with git-1.3.3 as
> well as with 1.4.0.rc2.g5e3a6. As for cvsps, I'm using version 2.1.
Do parsecvs has the same error?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
^ permalink raw reply
* Re: Collecting cvsps patches
From: Jakub Narebski @ 2006-06-13 16:52 UTC (permalink / raw)
To: git
In-Reply-To: <20060613151504.GN1297@nowhere.earth>
Yann Dirson wrote:
> Hi David,
>
> On Tue, Jun 13, 2006 at 09:46:46AM -0400, David Mansfield wrote:
>> At the very least, I should put some mention in the web page, is there
>> some text you want me to put up there, and/or a like?
>
> I have setup a Q&D page at
> http://ydirson.free.fr/en/software/scm/cvsps.html to link to.
I have added above link to GitWiki, at InterfacesFrontendsAndTools,
and at GitLinks.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #irc
^ permalink raw reply
* [PATCH] diff options: add --color
From: Johannes Schindelin @ 2006-06-13 16:45 UTC (permalink / raw)
To: git, junkio
This patch is a slightly adjusted version of Junio's patch:
http://www.gelato.unsw.edu.au/archives/git/0604/19354.html
However, instead of using a config variable, this patch makes it available
as a diff option.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
diff.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
diff.h | 3 ++
| 2 +-
3 files changed, 73 insertions(+), 11 deletions(-)
diff --git a/diff.c b/diff.c
index 9e9cfc8..bc32a4a 100644
--- a/diff.c
+++ b/diff.c
@@ -25,6 +25,20 @@ int git_diff_config(const char *var, con
return git_default_config(var, value);
}
+enum color_diff {
+ DIFF_PLAIN = 0,
+ DIFF_METAINFO = 1,
+ DIFF_FILE_OLD = 2,
+ DIFF_FILE_NEW = 3,
+};
+
+static const char *diff_colors[] = {
+ "\033[0;0m",
+ "\033[1;35m",
+ "\033[1;31m",
+ "\033[1;34m",
+};
+
static char *quote_one(const char *str)
{
int needlen;
@@ -177,23 +191,54 @@ static int fill_mmfile(mmfile_t *mf, str
}
struct emit_callback {
+ struct xdiff_emit_state xm;
+ int nparents, color_diff;
const char **label_path;
};
-static int fn_out(void *priv, mmbuffer_t *mb, int nbuf)
+static inline void color_diff(int diff_use_color, enum color_diff ix)
+{
+ if (diff_use_color)
+ fputs(diff_colors[ix], stdout);
+}
+
+static void fn_out_consume(void *priv, char *line, unsigned long len)
{
int i;
struct emit_callback *ecbdata = priv;
if (ecbdata->label_path[0]) {
+ color_diff(ecbdata->color_diff, DIFF_METAINFO);
printf("--- %s\n", ecbdata->label_path[0]);
+ color_diff(ecbdata->color_diff, DIFF_METAINFO);
printf("+++ %s\n", ecbdata->label_path[1]);
ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
}
- for (i = 0; i < nbuf; i++)
- if (!fwrite(mb[i].ptr, mb[i].size, 1, stdout))
- return -1;
- return 0;
+
+ /* This is not really necessary for now because
+ * this codepath only deals with two-way diffs.
+ */
+ for (i = 0; i < len && line[i] == '@'; i++)
+ ;
+ if (2 <= i && i < len && line[i] == ' ') {
+ ecbdata->nparents = i - 1;
+ color_diff(ecbdata->color_diff, DIFF_METAINFO);
+ }
+ else if (len < ecbdata->nparents)
+ color_diff(ecbdata->color_diff, DIFF_PLAIN);
+ else {
+ int nparents = ecbdata->nparents;
+ int color = DIFF_PLAIN;
+ for (i = 0; i < nparents && len; i++) {
+ if (line[i] == '-')
+ color = DIFF_FILE_OLD;
+ else if (line[i] == '+')
+ color = DIFF_FILE_NEW;
+ }
+ color_diff(ecbdata->color_diff, color);
+ }
+ fwrite(line, len, 1, stdout);
+ color_diff(ecbdata->color_diff, DIFF_PLAIN);
}
static char *pprint_rename(const char *a, const char *b)
@@ -549,25 +594,35 @@ static void builtin_diff(const char *nam
b_two = quote_two("b/", name_b);
lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
+ color_diff(o->color_diff, DIFF_METAINFO);
printf("diff --git %s %s\n", a_one, b_two);
if (lbl[0][0] == '/') {
/* /dev/null */
+ color_diff(o->color_diff, DIFF_METAINFO);
printf("new file mode %06o\n", two->mode);
- if (xfrm_msg && xfrm_msg[0])
+ if (xfrm_msg && xfrm_msg[0]) {
+ color_diff(o->color_diff, DIFF_METAINFO);
puts(xfrm_msg);
+ }
}
else if (lbl[1][0] == '/') {
printf("deleted file mode %06o\n", one->mode);
- if (xfrm_msg && xfrm_msg[0])
+ if (xfrm_msg && xfrm_msg[0]) {
+ color_diff(o->color_diff, DIFF_METAINFO);
puts(xfrm_msg);
+ }
}
else {
if (one->mode != two->mode) {
+ color_diff(o->color_diff, DIFF_METAINFO);
printf("old mode %06o\n", one->mode);
+ color_diff(o->color_diff, DIFF_METAINFO);
printf("new mode %06o\n", two->mode);
}
- if (xfrm_msg && xfrm_msg[0])
+ if (xfrm_msg && xfrm_msg[0]) {
+ color_diff(o->color_diff, DIFF_METAINFO);
puts(xfrm_msg);
+ }
/*
* we do not run diff between different kind
* of objects.
@@ -575,6 +630,7 @@ static void builtin_diff(const char *nam
if ((one->mode ^ two->mode) & S_IFMT)
goto free_ab_and_return;
if (complete_rewrite) {
+ color_diff(o->color_diff, DIFF_PLAIN);
emit_rewrite_diff(name_a, name_b, one, two);
goto free_ab_and_return;
}
@@ -602,7 +658,9 @@ static void builtin_diff(const char *nam
xdemitcb_t ecb;
struct emit_callback ecbdata;
+ memset(&ecbdata, 0, sizeof(ecbdata));
ecbdata.label_path = lbl;
+ ecbdata.color_diff = o->color_diff;
xpp.flags = XDF_NEED_MINIMAL;
xecfg.ctxlen = o->context;
xecfg.flags = XDL_EMIT_FUNCNAMES;
@@ -612,8 +670,9 @@ static void builtin_diff(const char *nam
xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
else if (!strncmp(diffopts, "-u", 2))
xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
- ecb.outf = fn_out;
+ ecb.outf = xdiff_outf;
ecb.priv = &ecbdata;
+ ecbdata.xm.consume = fn_out_consume;
xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
}
@@ -1456,6 +1515,8 @@ int diff_opt_parse(struct diff_options *
else if (40 < options->abbrev)
options->abbrev = 40;
}
+ else if (!strcmp(arg, "--color"))
+ options->color_diff = 1;
else
return 0;
return 1;
diff --git a/diff.h b/diff.h
index 99838e6..2b821df 100644
--- a/diff.h
+++ b/diff.h
@@ -32,7 +32,8 @@ struct diff_options {
full_index:1,
silent_on_remove:1,
find_copies_harder:1,
- summary:1;
+ summary:1,
+ color_diff:1;
int context;
int break_opt;
int detect_rename;
--git a/pager.c b/pager.c
index 9a30939..2d186e8 100644
--- a/pager.c
+++ b/pager.c
@@ -46,7 +46,7 @@ void setup_pager(void)
close(fd[0]);
close(fd[1]);
- setenv("LESS", "-S", 0);
+ setenv("LESS", "-RS", 0);
run_pager(pager);
die("unable to execute pager '%s'", pager);
exit(255);
--
1.4.0.gcaba-dirty
^ permalink raw reply related
* git-cvsimport doesn't quite work, wrt branches
From: Jim Meyering @ 2006-06-13 16:41 UTC (permalink / raw)
To: git; +Cc: Matthias Urlichs
Here's a test case that shows how git-cvsimport is misbehaving.
The script below demonstrates the problem with git-1.3.3 as
well as with 1.4.0.rc2.g5e3a6. As for cvsps, I'm using version 2.1.
The script creates a simple cvs module, with one file on the trunk,
and one file on a branch, then runs git-cvsimport on that. The error
is that the resulting git repository has both files on the branch.
FYI, this started when I tried to convert the GNU coreutils repository
(which takes barely an hour with git-cvsimport -- very quick, for 45K
revisions and 90MB of ,v files), but found that with a git-based working
directory, not all files on the b5_9x branch showed up after `git checkout
b5_9x' -- plus, there were some files there that didn't belong.
-----------------------------
#!/bin/sh
# Show that git-cvsimport doesn't quite work when
# there is one file on a branch, and another on the trunk.
# The resulting git repository has both files on the branch.
export PATH=/p/p/git/bin:$PATH
cvs='cvs -f -Q'
t=/tmp/.k
rm -rf $t
mkdir -p $t/git $t/cvs
R=$t/repo
$cvs -d $R init
mkdir -p $R/m
cd $t/cvs
$cvs -d $R co m
cd m
# Add a file on the trunk.
touch on-trunk
$cvs add on-trunk
$cvs ci -m. on-trunk
# Add another file, but destined for a branch.
touch on-br
$cvs add on-br
$cvs ci -m. on-br
$cvs tag -b B on-br
$cvs up -r B
echo x > on-br
$cvs ci -m. on-br
# Back to trunk.
$cvs up -A
# Remove our only-on-branch file from the trunk.
$cvs rm -f on-br
$cvs ci -m. on-br
$cvs up -r B
cd $t/git && git-cvsimport -p -x -v -d $R m >& $t/import-log
cd $t/git && git checkout B
cd $t
(cd cvs/m; ls -1 on-*) > cvs-files
(cd git; git-ls-files|sort) > git-files
diff -u1 cvs-files git-files
# The problem: diff reports the following differences.
# It should find none.
# --- cvs-files 2006-06-13 17:48:47.000000000 +0200
# +++ git-files 2006-06-13 17:48:47.000000000 +0200
# @@ -1 +1,2 @@
# ./on-br
# +./on-trunk
^ permalink raw reply
* Re: Collecting cvsps patches
From: Linus Torvalds @ 2006-06-13 15:47 UTC (permalink / raw)
To: Yann Dirson; +Cc: David Mansfield, Pavel Roskin, GIT list, cvsps
In-Reply-To: <20060613151504.GN1297@nowhere.earth>
On Tue, 13 Jun 2006, Yann Dirson wrote:
>
> I have setup a Q&D page at
> http://ydirson.free.fr/en/software/scm/cvsps.html to link to.
>
> I'll expand it later with more information.
Will you be able to set up gitweb on that site, perhaps?
Also, I guess that patch I posted in the "cvsps wierdness" thread (yeah,
yeah, bad spelling, but it wasn't me who started the thread) should
probably be added, since it fixed at least one test-case.
Although it should probably get more testing with a bigger and more
real-life repository..
(David: in case you didn't follow the git list, it makes
"compare_patch_sets_by_time()" compare by members _first_, and by time
_second_, so that if a file revision shows that a patchset was before
another one, it will use that as the primary sort order).
Linus
^ permalink raw reply
* Re: Collecting cvsps patches
From: Pavel Roskin @ 2006-06-13 15:39 UTC (permalink / raw)
To: Yann Dirson; +Cc: David Mansfield, GIT list, cvsps
In-Reply-To: <20060613151504.GN1297@nowhere.earth>
On Tue, 2006-06-13 at 17:15 +0200, Yann Dirson wrote:
> Hi David,
>
> On Tue, Jun 13, 2006 at 09:46:46AM -0400, David Mansfield wrote:
> > At the very least, I should put some mention in the web page, is there
> > some text you want me to put up there, and/or a like?
>
> I have setup a Q&D page at
> http://ydirson.free.fr/en/software/scm/cvsps.html to link to.
Thank you! By the way, CVSps is capitalized as CVSps, not CvsPs.
It would be great to install the gitweb interface so that the patches
could be viewed online.
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: Thoughts on adding another hook to git
From: Nikolai Weibull @ 2006-06-13 15:26 UTC (permalink / raw)
To: David Kowis; +Cc: Yakov Lerner, git
In-Reply-To: <448EB7B6.4020708@shlrm.org>
On 6/13/06, David Kowis <dkowis@shlrm.org> wrote:
> I'm using vim.
> 1 # Explicit paths specified without -i nor -o; assuming --only paths...
> 2 #
> 3 # Updated but not checked in:
> 4 # (will commit)
> 5 #
> 6 # modified: mail/abook/DETAILS
> 7 # modified: mail/abook/HISTORY
>
> What I'd like to be able to do is have that "abook" directory name
> automatically added to the top of my commit message before it gets into
> the editor. I can do this with a script (echo ${PWD##*/}) but it'd need
> to be a hook before the editor shows up.
autocmd BufRead .git/COMMIT_MSG call setline(1, expand('%:p:h:h:t'))
But that will of course do that for all commit-messages, so your point
is still valid.
nikolai
^ permalink raw reply
* Re: Collecting cvsps patches
From: Yann Dirson @ 2006-06-13 15:15 UTC (permalink / raw)
To: David Mansfield; +Cc: Pavel Roskin, GIT list, cvsps
In-Reply-To: <448EC1C6.5060902@dm.cobite.com>
Hi David,
On Tue, Jun 13, 2006 at 09:46:46AM -0400, David Mansfield wrote:
> At the very least, I should put some mention in the web page, is there
> some text you want me to put up there, and/or a like?
I have setup a Q&D page at
http://ydirson.free.fr/en/software/scm/cvsps.html to link to.
I'll expand it later with more information.
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: Collecting cvsps patches
From: David Mansfield @ 2006-06-13 13:46 UTC (permalink / raw)
To: Yann Dirson; +Cc: Pavel Roskin, GIT list, cvsps
In-Reply-To: <20060613095445.GM1297@nowhere.earth>
Yann Dirson wrote:
> Hi Pavel,
>
> On Tue, Jun 13, 2006 at 12:35:10AM -0400, Pavel Roskin wrote:
>> I'm sending four patches - two compile
>> fixes for recent regressions and two patches fixing DNS resolution on
>> 64-bit systems - one on Linux and the other on other OSes.
>
> Thanks, applied the two latter fixes, and folded the compile fix into
> the patch it should have been part of :)
>
> For the dependency stuff, I added the -Y flag to hte makedepend
> invocation. This produces many warnings, but at least does the job
> right.
>
> I'll push the whole once I have finished a little work on another
> branch.
>
> Please excuse any delays due to the recent birth of our 3rd son ;)
Congratulations. I'm really glad someone has taken some time to collect
these patches. I feel really bad about 'abandoning' (for now only, I
hope) the project.
At the very least, I should put some mention in the web page, is there
some text you want me to put up there, and/or a like?
David
^ permalink raw reply
* Re: Thoughts on adding another hook to git
From: David Kowis @ 2006-06-13 13:03 UTC (permalink / raw)
To: Nikolai Weibull; +Cc: Yakov Lerner, git
In-Reply-To: <dbfc82860606122329w77c566evb94ca79081a0a057@mail.gmail.com>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Nikolai Weibull wrote:
> On 6/12/06, David Kowis <dkowis@shlrm.org> wrote:
>> Yakov Lerner wrote:
>
>> > git-commit sure creates those temp files with
>> > specific naming in specific dir. You could check for
>> > that in EDITOR script. In the script, you could even check
>> > the name of the parent process.
>
>> This is true. However, I'd be running that script every time something
>> invoked $EDITOR. And some people may not like that solution. I'm
>> thinking that more than just I will like to use this pre-edit hook.
>> Especially in the distro I'm helping develop.
>
> Perhaps you could tell us what editor you are using. That way we may
> provide additional solutions.
>
I'm using vim. But that's irrelevant with what I'm trying to do.
Perhaps I need to explain more:
In SourceMage, we have a collection of scripts, the grimoire, that
contain the little bits of instructions on how to build and install all
the software. 99% of the time most commits are based in one directory.
For example:
I just updated the abook spell (A spell is that collection of
instructions I mentioned earlier.)
I modified two files. DETAILS and HISTORY.
DETAILS contains the version information, and a source hash to verify
downloads (and a bit of other stuff, but it's not important). HISTORY is
just a changelog. Now I do `git commit .`
I get:
1 # Explicit paths specified without -i nor -o; assuming --only paths...
2 #
3 # Updated but not checked in:
4 # (will commit)
5 #
6 # modified: mail/abook/DETAILS
7 # modified: mail/abook/HISTORY
What I'd like to be able to do is have that "abook" directory name
automatically added to the top of my commit message before it gets into
the editor. I can do this with a script (echo ${PWD##*/}) but it'd need
to be a hook before the editor shows up.
1 abook:
2 # Explicit paths specified without -i nor -o; assuming --only paths...
3 #
4 # Updated but not checked in:
5 # (will commit)
6 #
7 # modified: mail/abook/DETAILS
8 # modified: mail/abook/HISTORY
It helps in the short log (git log) for describing for which spell the
log refers. Although it could be done with an EDITOR script I don't
think that's the best solution. It's certainly not a good solution to
give out to a lot of people. Most of the changes to our grimoire are
like this one, so this would be extremely useful to us.
Hope that clears things up a bit,
- --
David Kowis
ISO Team Lead - www.sourcemage.org
Source Mage GNU/Linux
Progress isn't made by early risers. It's made by lazy men trying to
find easier ways to do something.
- Robert Heinlein
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
iQGVAwUBRI63tsnf+vRw63ObAQqvqAv/QkyEi4/wIDo+sQGMPkXhj/e7yMDXbVLm
XYaVhlxOG3rXfaEu6ecdjm8b6h4UYCMFnhYKUiDqD42LlEdofCIOecGULyP5Nx9q
JAL8BaZpq4MwRQt4HiX9oLQBTIW2ZcD9Fg5ZqFUL3QWFbjednbEl+M8/41JGFL4s
XpvIcKHfAy90qdG5QrgsHdQTAS6JG+9mFmyi4d0wlDWBh4WoutfEfL/nwbH79d2B
Udq6j/SIy0dmsbjNmzJnPYn5IVrFYGez4y5bW7LDpO5ddf4027iz9mNb8hd0wCzL
akh1f4xQQ178iaFz4y60TTmNavxswRmdoKTghRKet0MXTtBTUXe0TUJ5vNOtKODz
5MWu9M5/olCcLqlb7L6wnvqJ9HnJTvAEAUQpvKztQcC2Uy2XkpznW3XmeEK50CLU
VQjxSzubUfXDxkf/hS1nY3WKL3UuQoGWVDmL2Maxno+Kwb3YoyW5+etvYvfoqNT7
Vi7bpiX6fPVF/r6ogATzqla2EFLsta1f
=m3vG
-----END PGP SIGNATURE-----
^ permalink raw reply
* Re: Herr Lederhofer bitte melden Sie sich bezügl. der Vertragsverlängerung bei mir.
From: Nicolas Vilz 'niv' @ 2006-06-13 10:07 UTC (permalink / raw)
To: git
In-Reply-To: <E1Fq2y8-0007Yz-Kg@moooo.ath.cx>
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
On Tue, Jun 13, 2006 at 09:05:44AM +0200, Matthias Lederhofer wrote:
> Argh, sorry for that. :/
Funny, but the same unavoidable error occured to me today...
Sincerly
Nicolas
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: Collecting cvsps patches
From: Yann Dirson @ 2006-06-13 9:54 UTC (permalink / raw)
To: Pavel Roskin; +Cc: GIT list, cvsps
In-Reply-To: <1150173310.15831.6.camel@dv>
Hi Pavel,
On Tue, Jun 13, 2006 at 12:35:10AM -0400, Pavel Roskin wrote:
> I'm sending four patches - two compile
> fixes for recent regressions and two patches fixing DNS resolution on
> 64-bit systems - one on Linux and the other on other OSes.
Thanks, applied the two latter fixes, and folded the compile fix into
the patch it should have been part of :)
For the dependency stuff, I added the -Y flag to hte makedepend
invocation. This produces many warnings, but at least does the job
right.
I'll push the whole once I have finished a little work on another
branch.
Please excuse any delays due to the recent birth of our 3rd son ;)
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: Problem upgrading to 1.4.0
From: Geoff Russell @ 2006-06-13 7:10 UTC (permalink / raw)
To: git
In-Reply-To: <1150170985.4297.104.camel@dv>
On 6/13/06, Pavel Roskin <proski@gnu.org> wrote:
> On Mon, 2006-06-12 at 20:28 -0700, Linus Torvalds wrote:
> >
> > On Mon, 12 Jun 2006, Pavel Roskin wrote:
> > >
> > > > You can get a list of the remote branches whenever you want:
> > > >
> > > > $ git ls-remote -h <remote>
> > >
> > > I heard of that command. But git-clone only uses it for local and rsync
> > > protocols.
> >
> > The native format doesn't _need_ to use "git ls-remote", because the
> > native format does it on its own.
>
> OK. I actually suspected that git-ls-remote was limited to some
> protocols. I'm glad to be wrong about it.
Just so we don't lose sight of the forest for the trees, the most
common thing I want to do is: "get me up-to-date-with-origin,
don't overwrite any branches of mine, but get me anything on the
origin which I don't have". Hence I think this should be one fairly
simple command -- git pull origin.
The first time I had this problem, I gave up trying to fix it and just
rm'd my git
repository and re'cloned it. The second time it happened, I knew a
little bit more and worked out how to fix it.
Cheers,
Geoff Russell
>
> --
> Regards,
> Pavel Roskin
>
>
^ permalink raw reply
* Re: Thoughts on adding another hook to git
From: Nikolai Weibull @ 2006-06-13 6:29 UTC (permalink / raw)
To: David Kowis; +Cc: Yakov Lerner, git
In-Reply-To: <448DBEEB.3000308@shlrm.org>
On 6/12/06, David Kowis <dkowis@shlrm.org> wrote:
> Yakov Lerner wrote:
> > git-commit sure creates those temp files with
> > specific naming in specific dir. You could check for
> > that in EDITOR script. In the script, you could even check
> > the name of the parent process.
> This is true. However, I'd be running that script every time something
> invoked $EDITOR. And some people may not like that solution. I'm
> thinking that more than just I will like to use this pre-edit hook.
> Especially in the distro I'm helping develop.
Perhaps you could tell us what editor you are using. That way we may
provide additional solutions.
nikolai
^ permalink raw reply
* Re: [PATCH] blame: Add --time to produce raw timestamps
From: Fredrik Kuivinen @ 2006-06-13 6:08 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Fredrik Kuivinen, git, junkio
In-Reply-To: <Pine.LNX.4.63.0606130038370.25422@wbgn013.biozentrum.uni-wuerzburg.de>
On Tue, Jun 13, 2006 at 12:41:19AM +0200, Johannes Schindelin wrote:
<comments on "blame: Add --time to produce raw timestamps">
Thanks for the comments. Updated patch below.
- Fredrik
-------
blame: Add --time to produce raw timestamps
fix the usage string and clean up the docs while we are at it
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
---
Documentation/git-blame.txt | 5 ++++-
blame.c | 24 ++++++++++++++++++++----
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 0a1fa00..bfed945 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -20,7 +20,10 @@ OPTIONS
Use the same output mode as git-annotate (Default: off).
-l, --long::
- Show long rev (Defaults off).
+ Show long rev (Default: off).
+
+-t, --time::
+ Show raw timestamp (Default: off).
-S, --rev-file <revs-file>::
Use revs from revs-file instead of calling git-rev-list.
diff --git a/blame.c b/blame.c
index 88bfec2..25d3bcf 100644
--- a/blame.c
+++ b/blame.c
@@ -20,9 +20,11 @@ #include "xdiff-interface.h"
#define DEBUG 0
-static const char blame_usage[] = "[-c] [-l] [--] file [commit]\n"
+static const char blame_usage[] = "[-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n"
" -c, --compability Use the same output mode as git-annotate (Default: off)\n"
" -l, --long Show long commit SHA1 (Default: off)\n"
+ " -t, --time Show raw timestamp (Default: off)\n"
+ " -S, --revs-file Use revisions from revs-file instead of calling git-rev-list\n"
" -h, --help This message";
static struct commit **blame_lines;
@@ -680,13 +682,19 @@ static void get_commit_info(struct commi
*tmp = 0;
}
-static const char* format_time(unsigned long time, const char* tz_str)
+static const char* format_time(unsigned long time, const char* tz_str,
+ int show_raw_time)
{
static char time_buf[128];
time_t t = time;
int minutes, tz;
struct tm *tm;
+ if (show_raw_time) {
+ sprintf(time_buf, "%lu %s", time, tz_str);
+ return time_buf;
+ }
+
tz = atoi(tz_str);
minutes = tz < 0 ? -tz : tz;
minutes = (minutes / 100)*60 + (minutes % 100);
@@ -740,6 +748,7 @@ int main(int argc, const char **argv)
char filename_buf[256];
int sha1_len = 8;
int compability = 0;
+ int show_raw_time = 0;
int options = 1;
struct commit* start_commit;
@@ -768,6 +777,10 @@ int main(int argc, const char **argv)
!strcmp(argv[i], "--compability")) {
compability = 1;
continue;
+ } else if(!strcmp(argv[i], "-t") ||
+ !strcmp(argv[i], "--time")) {
+ show_raw_time = 1;
+ continue;
} else if(!strcmp(argv[i], "-S")) {
if (i + 1 < argc &&
!read_ancestry(argv[i + 1], &sha1_p)) {
@@ -873,14 +886,17 @@ int main(int argc, const char **argv)
fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
if(compability) {
printf("\t(%10s\t%10s\t%d)", ci.author,
- format_time(ci.author_time, ci.author_tz), i+1);
+ format_time(ci.author_time, ci.author_tz,
+ show_raw_time),
+ i+1);
} else {
if (found_rename)
printf(" %-*.*s", longest_file, longest_file,
u->pathname);
printf(" (%-*.*s %10s %*d) ",
longest_author, longest_author, ci.author,
- format_time(ci.author_time, ci.author_tz),
+ format_time(ci.author_time, ci.author_tz,
+ show_raw_time),
max_digits, i+1);
}
^ permalink raw reply related
* Re: cvsps wierdness
From: Robin Rosenberg (list subscriber) @ 2006-06-13 6:06 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
In-Reply-To: <Pine.LNX.4.64.0606121406200.5498@g5.osdl.org>
måndag 12 juni 2006 23:27 skrev Linus Torvalds:
[...]
> Does this patch fix it for you (untested - it could result in tons of
> other trouble, but it basically just says that time ordering is less
> important than member revision ordering).
Thanks, it worked on the simple case at least. We'll see about the original
full repo later.
>
> I don't think this is strictly correct, btw. I suspect you can still get
> into strange situations where the changeset merging has resulted in one
> file ordering one way, and another file ordering the other way.
Doesn't cvsps's conflict handing simply break up those patches into several
patches? More patches is ok. Suboptimal patches can be accepted
-- robin
^ permalink raw reply
* Re: Collecting cvsps patches
From: Pavel Roskin @ 2006-06-13 4:35 UTC (permalink / raw)
To: Yann Dirson; +Cc: GIT list, cvsps
In-Reply-To: <20060611122746.GB7766@nowhere.earth>
Hi, Yann!
On Sun, 2006-06-11 at 14:27 +0200, Yann Dirson wrote:
> Since there are has been some work done here and there on cvsps, but
> upstream does not seem to have time to issue a new release, I have
> started to collect the patches I found.
That's great news. Thank you! I'm sending four patches - two compile
fixes for recent regressions and two patches fixing DNS resolution on
64-bit systems - one on Linux and the other on other OSes.
--
Regards,
Pavel Roskin
^ permalink raw reply
* [PATCH 4/4] Use INADDR_NONE instead of -1 to check inet_addr() result
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
In-Reply-To: <20060613043224.16681.98358.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
INADDR_NONE is not equal to -1 on 64-bit systems.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
cbtcommon/tcpsocket.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
index a174007..f31060e 100644
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c
@@ -198,7 +198,7 @@ #ifdef __linux__
memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
}
#else
- if ( (*dest = inet_addr(addr_str)) != -1)
+ if ( (*dest = inet_addr(addr_str)) != INADDR_NONE)
{
/* nothing */
}
^ permalink raw reply related
* [PATCH 3/4] Use __linux__ conditional, not LINUX.
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
In-Reply-To: <20060613043224.16681.98358.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
__linux__ is defined automatically, LINUX is not.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
cbtcommon/tcpsocket.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
index 27cc13a..a174007 100644
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c
@@ -185,14 +185,14 @@ #endif
int
convert_address(long *dest, const char *addr_str)
{
-#ifdef LINUX
+#ifdef __linux__
struct in_addr ip;
#endif
int retval = 0;
char errstr[256];
/* first try converting "numbers and dots" notation */
-#ifdef LINUX
+#ifdef __linux__
if ( inet_aton(addr_str, &ip) )
{
memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
^ permalink raw reply related
* [PATCH 2/4] Trivial compile fix for cache.c
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
In-Reply-To: <20060613043224.16681.98358.stgit@dv.roinet.com>
From: Pavel Roskin <proski@gnu.org>
"tagnames" was renamed to "link", fix the last occurrence of "tagnames".
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
cache.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cache.c b/cache.c
index 409392d..07e5d02 100644
--- a/cache.c
+++ b/cache.c
@@ -501,7 +501,7 @@ static void dump_patch_set(FILE * fp, Pa
struct list_head * tag;
for (tag = ps->tags.next; tag != &ps->tags; tag = tag->next)
{
- TagName* tagname = list_entry (tag, TagName, tagnames);
+ TagName* tagname = list_entry (tag, TagName, link);
fprintf(fp, " %s %d%s", tagname->name, tagname->flags,
(tag->next == &ps->tags) ? "" : ",");
^ permalink raw reply related
* [PATCH 1/4] Remove dependencies with absolute path
From: Pavel Roskin @ 2006-06-13 4:32 UTC (permalink / raw)
To: Yann Dirson, git, cvsps
From: Pavel Roskin <proski@gnu.org>
Not everybody has headers in the same locations and not everybody uses
gcc 3.3.6. Only leave dependencies with relative path.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
Makefile | 213 ++++----------------------------------------------------------
1 files changed, 14 insertions(+), 199 deletions(-)
diff --git a/Makefile b/Makefile
index 1257ae7..cc277e2 100644
--- a/Makefile
+++ b/Makefile
@@ -38,218 +38,33 @@ clean:
.PHONY: install clean
# DO NOT DELETE
-cache.o: /usr/include/stdio.h /usr/include/features.h
-cache.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cache.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cache.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cache.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cache.o: /usr/include/_G_config.h /usr/include/wchar.h
-cache.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cache.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cache.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-cache.o: /usr/include/search.h /usr/include/string.h /usr/include/stdlib.h
-cache.o: /usr/include/limits.h
-cache.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cache.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-cache.o: /usr/include/bits/confname.h /usr/include/ctype.h
-cache.o: /usr/include/endian.h /usr/include/bits/endian.h /usr/include/time.h
-cache.o: /usr/include/bits/time.h ./cbtcommon/hash.h ./cbtcommon/list.h
-cache.o: ./cbtcommon/inline.h ./cbtcommon/debug.h /usr/include/sys/types.h
+cache.o: ./cbtcommon/hash.h ./cbtcommon/list.h
+cache.o: ./cbtcommon/inline.h ./cbtcommon/debug.h
cache.o: cache.h cvsps_types.h cvsps.h util.h
-cap.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
-cap.o: /usr/include/gnu/stubs.h
-cap.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cap.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cap.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cap.o: /usr/include/_G_config.h /usr/include/wchar.h
-cap.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cap.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cap.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-cap.o: /usr/include/stdlib.h /usr/include/string.h ./cbtcommon/debug.h
-cap.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/bits/time.h
+cap.o: ./cbtcommon/debug.h
cap.o: ./cbtcommon/inline.h ./cbtcommon/text_util.h cap.h cvs_direct.h
-cvs_direct.o: /usr/include/string.h /usr/include/features.h
-cvs_direct.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cvs_direct.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cvs_direct.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-cvs_direct.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cvs_direct.o: /usr/include/bits/typesizes.h /usr/include/bits/confname.h
-cvs_direct.o: /usr/include/stdlib.h /usr/include/limits.h
-cvs_direct.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cvs_direct.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cvs_direct.o: /usr/include/zlib.h /usr/include/zconf.h
-cvs_direct.o: /usr/include/sys/types.h /usr/include/time.h
-cvs_direct.o: /usr/include/bits/time.h /usr/include/sys/socket.h
-cvs_direct.o: /usr/include/sys/uio.h /usr/include/bits/uio.h
-cvs_direct.o: /usr/include/bits/socket.h /usr/include/bits/sockaddr.h
-cvs_direct.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
-cvs_direct.o: ./cbtcommon/debug.h /usr/include/stdio.h /usr/include/libio.h
-cvs_direct.o: /usr/include/_G_config.h /usr/include/wchar.h
-cvs_direct.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cvs_direct.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
+cvs_direct.o: ./cbtcommon/debug.h
cvs_direct.o: ./cbtcommon/inline.h ./cbtcommon/text_util.h
cvs_direct.o: ./cbtcommon/tcpsocket.h ./cbtcommon/sio.h cvs_direct.h util.h
-cvsps.o: /usr/include/stdio.h /usr/include/features.h
-cvsps.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cvsps.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cvsps.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cvsps.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cvsps.o: /usr/include/_G_config.h /usr/include/wchar.h
-cvsps.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cvsps.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cvsps.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-cvsps.o: /usr/include/stdlib.h /usr/include/string.h /usr/include/limits.h
-cvsps.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cvsps.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-cvsps.o: /usr/include/bits/confname.h /usr/include/search.h
-cvsps.o: /usr/include/time.h /usr/include/bits/time.h /usr/include/ctype.h
-cvsps.o: /usr/include/endian.h /usr/include/bits/endian.h
-cvsps.o: /usr/include/sys/stat.h /usr/include/bits/stat.h
-cvsps.o: /usr/include/sys/types.h /usr/include/fcntl.h
-cvsps.o: /usr/include/bits/fcntl.h /usr/include/regex.h
-cvsps.o: /usr/include/sys/wait.h /usr/include/signal.h
-cvsps.o: /usr/include/bits/sigset.h /usr/include/bits/signum.h
-cvsps.o: /usr/include/sys/resource.h /usr/include/bits/resource.h
-cvsps.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
cvsps.o: ./cbtcommon/hash.h ./cbtcommon/list.h ./cbtcommon/inline.h
cvsps.o: ./cbtcommon/list.h ./cbtcommon/text_util.h ./cbtcommon/debug.h
cvsps.o: ./cbtcommon/rcsid.h cache.h cvsps_types.h cvsps.h util.h stats.h
cvsps.o: cap.h cvs_direct.h list_sort.h
-list_sort.o: /usr/include/stdio.h /usr/include/features.h
-list_sort.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-list_sort.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-list_sort.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-list_sort.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-list_sort.o: /usr/include/_G_config.h /usr/include/wchar.h
-list_sort.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-list_sort.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-list_sort.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-list_sort.o: /usr/include/stdlib.h list_sort.h ./cbtcommon/list.h
-stats.o: /usr/include/stdio.h /usr/include/features.h
-stats.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-stats.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-stats.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-stats.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-stats.o: /usr/include/_G_config.h /usr/include/wchar.h
-stats.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-stats.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-stats.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-stats.o: /usr/include/string.h /usr/include/search.h ./cbtcommon/hash.h
+list_sort.o: list_sort.h ./cbtcommon/list.h
+stats.o: ./cbtcommon/hash.h
stats.o: ./cbtcommon/list.h ./cbtcommon/inline.h cvsps_types.h
-stats.o: /usr/include/time.h /usr/include/bits/time.h cvsps.h
-util.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h
-util.o: /usr/include/gnu/stubs.h
-util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-util.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-util.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-util.o: /usr/include/_G_config.h /usr/include/wchar.h
-util.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-util.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-util.o: /usr/include/string.h /usr/include/stdlib.h /usr/include/unistd.h
-util.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
-util.o: /usr/include/limits.h
-util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-util.o: /usr/include/assert.h /usr/include/search.h /usr/include/time.h
-util.o: /usr/include/bits/time.h /usr/include/errno.h
-util.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
-util.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
-util.o: /usr/include/asm-generic/errno-base.h /usr/include/signal.h
-util.o: /usr/include/bits/sigset.h /usr/include/bits/signum.h
-util.o: /usr/include/regex.h /usr/include/sys/types.h /usr/include/sys/stat.h
-util.o: /usr/include/bits/stat.h /usr/include/sys/time.h
-util.o: /usr/include/sys/select.h /usr/include/bits/select.h
-util.o: /usr/include/sys/wait.h /usr/include/sys/resource.h
-util.o: /usr/include/bits/resource.h /usr/include/bits/waitflags.h
-util.o: /usr/include/bits/waitstatus.h ./cbtcommon/debug.h
+stats.o: cvsps.h
+util.o: ./cbtcommon/debug.h
util.o: ./cbtcommon/inline.h util.h
-cbtcommon/debug.o: /usr/include/stdio.h /usr/include/features.h
-cbtcommon/debug.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/debug.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/debug.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/debug.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cbtcommon/debug.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/debug.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/debug.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/debug.o: /usr/include/bits/stdio_lim.h
-cbtcommon/debug.o: /usr/include/bits/sys_errlist.h /usr/include/errno.h
-cbtcommon/debug.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
-cbtcommon/debug.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
-cbtcommon/debug.o: /usr/include/asm-generic/errno-base.h /usr/include/ctype.h
-cbtcommon/debug.o: /usr/include/endian.h /usr/include/bits/endian.h
-cbtcommon/debug.o: /usr/include/string.h cbtcommon/debug.h
-cbtcommon/debug.o: /usr/include/sys/types.h /usr/include/time.h
-cbtcommon/debug.o: /usr/include/bits/time.h ./cbtcommon/inline.h
+cbtcommon/debug.o: cbtcommon/debug.h
+cbtcommon/debug.o: ./cbtcommon/inline.h
cbtcommon/debug.o: cbtcommon/rcsid.h
-cbtcommon/hash.o: /usr/include/stdio.h /usr/include/features.h
-cbtcommon/hash.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/hash.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/hash.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/hash.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cbtcommon/hash.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/hash.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/hash.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/hash.o: /usr/include/bits/stdio_lim.h
-cbtcommon/hash.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
-cbtcommon/hash.o: /usr/include/string.h cbtcommon/debug.h
-cbtcommon/hash.o: /usr/include/sys/types.h /usr/include/time.h
-cbtcommon/hash.o: /usr/include/bits/time.h ./cbtcommon/inline.h
+cbtcommon/hash.o: cbtcommon/debug.h
+cbtcommon/hash.o: ./cbtcommon/inline.h
cbtcommon/hash.o: cbtcommon/hash.h ./cbtcommon/list.h cbtcommon/rcsid.h
-cbtcommon/sio.o: /usr/include/stdio.h /usr/include/features.h
-cbtcommon/sio.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/sio.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/sio.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/sio.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-cbtcommon/sio.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/sio.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/sio.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/sio.o: /usr/include/bits/stdio_lim.h
-cbtcommon/sio.o: /usr/include/bits/sys_errlist.h /usr/include/unistd.h
-cbtcommon/sio.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
-cbtcommon/sio.o: /usr/include/errno.h /usr/include/bits/errno.h
-cbtcommon/sio.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
-cbtcommon/sio.o: /usr/include/asm-generic/errno.h
-cbtcommon/sio.o: /usr/include/asm-generic/errno-base.h cbtcommon/sio.h
+cbtcommon/sio.o: cbtcommon/sio.h
cbtcommon/sio.o: cbtcommon/rcsid.h
-cbtcommon/tcpsocket.o: /usr/include/string.h /usr/include/features.h
-cbtcommon/tcpsocket.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/tcpsocket.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/tcpsocket.o: /usr/include/sys/types.h /usr/include/bits/types.h
-cbtcommon/tcpsocket.o: /usr/include/bits/wordsize.h
-cbtcommon/tcpsocket.o: /usr/include/bits/typesizes.h /usr/include/time.h
-cbtcommon/tcpsocket.o: /usr/include/bits/time.h /usr/include/sys/socket.h
-cbtcommon/tcpsocket.o: /usr/include/sys/uio.h /usr/include/bits/uio.h
-cbtcommon/tcpsocket.o: /usr/include/bits/socket.h /usr/include/limits.h
-cbtcommon/tcpsocket.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/limits.h
-cbtcommon/tcpsocket.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
-cbtcommon/tcpsocket.o: /usr/include/asm/sockios.h /usr/include/netinet/in.h
-cbtcommon/tcpsocket.o: /usr/include/stdint.h /usr/include/bits/wchar.h
-cbtcommon/tcpsocket.o: /usr/include/bits/in.h /usr/include/endian.h
-cbtcommon/tcpsocket.o: /usr/include/bits/endian.h
-cbtcommon/tcpsocket.o: /usr/include/bits/byteswap.h /usr/include/arpa/inet.h
-cbtcommon/tcpsocket.o: /usr/include/netdb.h /usr/include/bits/netdb.h
-cbtcommon/tcpsocket.o: /usr/include/errno.h /usr/include/bits/errno.h
-cbtcommon/tcpsocket.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
-cbtcommon/tcpsocket.o: /usr/include/asm-generic/errno.h
-cbtcommon/tcpsocket.o: /usr/include/asm-generic/errno-base.h
cbtcommon/tcpsocket.o: cbtcommon/tcpsocket.h cbtcommon/debug.h
-cbtcommon/tcpsocket.o: /usr/include/stdio.h /usr/include/libio.h
-cbtcommon/tcpsocket.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/tcpsocket.o: /usr/include/gconv.h
-cbtcommon/tcpsocket.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/tcpsocket.o: /usr/include/bits/stdio_lim.h
-cbtcommon/tcpsocket.o: /usr/include/bits/sys_errlist.h ./cbtcommon/inline.h
+cbtcommon/tcpsocket.o: ./cbtcommon/inline.h
cbtcommon/tcpsocket.o: cbtcommon/rcsid.h
-cbtcommon/text_util.o: /usr/include/ctype.h /usr/include/features.h
-cbtcommon/text_util.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
-cbtcommon/text_util.o: /usr/include/bits/types.h /usr/include/bits/wordsize.h
-cbtcommon/text_util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stddef.h
-cbtcommon/text_util.o: /usr/include/bits/typesizes.h /usr/include/endian.h
-cbtcommon/text_util.o: /usr/include/bits/endian.h /usr/include/string.h
-cbtcommon/text_util.o: /usr/include/stdio.h /usr/include/libio.h
-cbtcommon/text_util.o: /usr/include/_G_config.h /usr/include/wchar.h
-cbtcommon/text_util.o: /usr/include/bits/wchar.h /usr/include/gconv.h
-cbtcommon/text_util.o: /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/include/stdarg.h
-cbtcommon/text_util.o: /usr/include/bits/stdio_lim.h
-cbtcommon/text_util.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
cbtcommon/text_util.o: cbtcommon/text_util.h cbtcommon/rcsid.h
^ permalink raw reply related
* Re: cvs import error
From: carbonated beverage @ 2006-06-13 4:25 UTC (permalink / raw)
To: git
In-Reply-To: <46a038f90606112101la88168xc5d540fe1220fbf8@mail.gmail.com>
Whups, make an error on the reply so it didn't hit the list:
Switched to the git 'next' branch, applied that patch, nuked ~/.cvsps
(forgot it cached stuff), and rm'ing the one directory that was giving
cvsps fits (in that order) finally allowed the rest of the repo to get
imported.
Thanks!
-- DN
Daniel
^ permalink raw reply
* Re: Problem upgrading to 1.4.0
From: Pavel Roskin @ 2006-06-13 3:56 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Sean, git, geoffrey.russell
In-Reply-To: <Pine.LNX.4.64.0606122024400.5498@g5.osdl.org>
On Mon, 2006-06-12 at 20:28 -0700, Linus Torvalds wrote:
>
> On Mon, 12 Jun 2006, Pavel Roskin wrote:
> >
> > > You can get a list of the remote branches whenever you want:
> > >
> > > $ git ls-remote -h <remote>
> >
> > I heard of that command. But git-clone only uses it for local and rsync
> > protocols.
>
> The native format doesn't _need_ to use "git ls-remote", because the
> native format does it on its own.
OK. I actually suspected that git-ls-remote was limited to some
protocols. I'm glad to be wrong about it.
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: git-applymbox broken?
From: Ryan Anderson @ 2006-06-13 3:41 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: Linus Torvalds, Junio C Hamano, Git Mailing List
In-Reply-To: <m1wtbn468o.fsf@ebiederm.dsl.xmission.com>
On Sun, Jun 11, 2006 at 05:33:59PM -0600, Eric W. Biederman wrote:
> Linus Torvalds <torvalds@osdl.org> writes:
>
> > It looks like something has broken git-applymbox lately.
> >
> > The "From: authorname" lines are no longer removed from the message, and
> > are duplicated in the commit log. This has resulted in several recent
> > kernel commits looking like this:
>
> Agreed. That isn't terribly desirable.
> Do you have the original email message some place?
>
> There is an odd case where if someone put the From: header
> in the middle of the text that we now notice and process and I
> didn't feel right about removing a line from the middle of the
> text.
>
> I was fixing a nasty corner case that happens if there aren't any
> mail headers at all passed to git-mailinfo. Where we could drop
> lines without processing them at all.
>
> This doesn't look like the From: header was in the middle of the
> message until it was imported into git so it is probably a small
> logic error that is easily corrected. But I need to see what
> we are parsing so I can understand what is happening.
I hate to say this, because I'm bad about it, too, but we should
probably have a few tests for applymbox, to cover the various scenarios
discussed in this thread.
--
Ryan Anderson
sometimes Pug Majere
^ permalink raw reply
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