Linus Torvalds <[EMAIL PROTECTED]> writes:
> On Thu, 14 Jul 2005, Junio C Hamano wrote:
>>
>> That said, I have been hating that diff options parsing for
>> quite a while, and I've been thinking about cleaning it up along
>> the lines I'll outline here, but have not done anything about
>> it. Ca
On Thu, 14 Jul 2005, Junio C Hamano wrote:
>
> That said, I have been hating that diff options parsing for
> quite a while, and I've been thinking about cleaning it up along
> the lines I'll outline here, but have not done anything about
> it. Care to help me out?
I didn't do what you suggeste
Well, it wasn't as Ok as I first thought. There were several .rej and
backup files as left behind by patch(1). cg update HEAD says: Branch
already fully merged but Makefile still says 2.6.12.
I'm cloning now to a remote uml and will try and rsync from there to
the laptop. Perhaps *that* will g
Wonderful.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Linus Torvalds <[EMAIL PROTECTED]> writes:
> On Thu, 14 Jul 2005, Linus Torvalds wrote:
>>
>> I'll look into making diff-cache be more efficient. I normally don't use
>> it myself, so I didn't bother (I use git-diff-files, which is way more
>> efficient, but doesn't show the difference against the
Junio C Hamano <[EMAIL PROTECTED]> writes:
> [EMAIL PROTECTED] (Eric W. Biederman) writes:
>
>> Actually I could not see something the system administrator
>> had bone being anything but present tense. If you have to type
>> 500+ characters just to login, I think you would have noticed
>> and com
It's not any harder to include debian package support
than to include a spec file so here is the setup
to build the equivalent debian package.
Signed-off-by: Eric W. Biederman <[EMAIL PROTECTED]>
---
debian/changelog |5 +++
debian/control | 17 ++
debian/copyrig
If you don't want the documentation simply build with
make RPMBUILD="rpmbuild --without docs"
Signed-off-by: Eric W. Biederman <[EMAIL PROTECTED]>
---
git-core.spec.in | 14 ++
1 files changed, 10 insertions(+), 4 deletions(-)
18d85dbab2fca214bfb625e65733d5fa52502111
diff --git a
This makes it straight forward for people wanting to build
and install the git man pages and the rest of the documentation
to do so.
Signed-off-by: Eric W. Biederman <[EMAIL PROTECTED]>
---
Documentation/Makefile | 13 +
Makefile |6 ++
2 files changed, 19 in
This allows rebuilding the tarball when it is already present
without having to answer annoying questions from gzip
Signed-off-by: Eric W. Biederman <[EMAIL PROTECTED]>
---
Makefile |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
d7c4e5ae707a6ad3028c48d800d568c554cc10af
diff --git
This allows RPMBUILD to be overridden for people with
old versions of rpm or people who want to pass rpmbuild extra options.
Signed-off-by: Eric W. Biederman <[EMAIL PROTECTED]>
---
Makefile |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
50c6a0b3b5d461b81bd5ceb0808206bfa20a8bfa
d
And finally what all of this has been leading up to.
The 2 line code change to record who made a tag,
and the 8 line code change to check that we recorded
the tag.
Gosh the error checking is always so much bigger than the code :)
---
git-tag-script |3 ++-
mktag.c| 10 --
When testing tags I ran into an interesting problem.
git-tag-script dies if .git/refs/tags/ does not exist.
And that directory didn't get created when I build my repository,
so we need to create it if it doesn't exist.
Signed-of-by: Eric W. Biederman <[EMAIL PROTECTED]>
---
git-tag-script |
With the recent work on setup_ident() there are
a few more possible diagnostic messages form git-commit-tree
Signed-off-by: Eric W. Biederman <[EMAIL PROTECTED]>
---
Documentation/git-commit-tree.txt |4
1 files changed, 4 insertions(+), 0 deletions(-)
3dccd7f0c9e3cbc8bc17d3af01f9f1d27
Sharing code between shell scripts and C is a challenge.
The program git-var allows us to have a set of named values
that a shell script can interrogate and a normal C program
can simply call the functions that compute them.Allowing
sharing when computing plain test values.
---
Documentatio
If your user name is too long it is your sysadmin who
hates you not your parents!
Signed-off-by: Eric W. Biederman <[EMAIL PROTECTED]>
---
ident.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
935f88376b79fc19df6dff85ba57ed94f06d79f0
diff --git a/ident.c b/ident.c
--- a/ident.c
Moving these functions allows all of the logic for figuring out what
these values are to be shared between programs.
---
cache.h |2 ++
commit-tree.c | 10 --
ident.c | 10 ++
3 files changed, 12 insertions(+), 10 deletions(-)
c6f1b65729df142a8968441ca441f6b6
Hi,
Gct v0.1 has been released and can be downloaded from
http://www.cyd.liu.se/~freku045/gct/gct-0.1.tar.gz
What follows is an excerpt from the README in the tarball:
Introduction
Git Commit Tool or gct is a simple GUI enabled Git commit tool. It
allows the user to select which fi
Junio C Hamano <[EMAIL PROTECTED]> writes:
> Eric W. Biederman xmission.com> writes:
>
>
>> Part of the request was to put all of this information together
>> in a common place. And note that it is actually:
>> tagger="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE"
>> Where the
Junio C Hamano <[EMAIL PROTECTED]> writes:
> I am afraid I do not follow you.
I was confused. My big problem was that we don't really have
an in tree user, and there wasn't a good explanation anywhere. So it
was hard to track this down.
I'm going to lobby for a script to import patches from
On Thu, 14 Jul 2005, Linus Torvalds wrote:
>
> I'll look into making diff-cache be more efficient. I normally don't use
> it myself, so I didn't bother (I use git-diff-files, which is way more
> efficient, but doesn't show the difference against the _tree_, it shows
> the difference against the i
Hi,
Junio C Hamano:
> That said, I have been hating that diff options parsing for
> quite a while, and I've been thinking about cleaning it up along
> the lines I'll outline here, but have not done anything about
> it. Care to help me out?
>
I saw the problem...
>
> Hmm?
>
Sure -- assuming I f
Matthias Urlichs <[EMAIL PROTECTED]> writes:
> Exactly the same thing as vice versa.
> Or, even more exactly, my patch *makes* that happen. ;-)
Ah, I was not being careful enough. Sorry.
That said, I have been hating that diff options parsing for
quite a while, and I've been thinking about clea
Hi,
Junio C Hamano:
> I've considered it, but what happens if you give -z first and
> then name-only?
>
Exactly the same thing as vice versa.
Or, even more exactly, my patch *makes* that happen. ;-)
--
Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED]
Disclaimer: The quo
I've considered it, but what happens if you give -z first and
then name-only?
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
> "Darrin" == Darrin Thompson <[EMAIL PROTECTED]> writes:
Darrin> Now your merge should not be blocked. No?
I figured out what you meant after I sent that first reply, but waited
for update to finish to be sure it worked before replying again.
It took about thirty minutes, and claimed that I
Junio C Hamano wrote:
> + else if (!strcmp(arg, "--name-only-z"))
> + diff_output_format = DIFF_FORMAT_NAME_Z;
Speaking as a user, I would get rather frustrated when I try to do that
and it doesn't work... so the attached patch allows that usage.
Please apply.
---
On Thu, 2005-07-14 at 16:06 -0400, James Cloos wrote:
> > "Darrin" == Darrin Thompson <[EMAIL PROTECTED]> writes:
>
> JimC> cg-merge: merge blocked: seeked from master `
>
> Darrin> cg-seek master ?
>
> :; cg seek master
> On commit 514fd7fd01d378a7b5584c657d9807fc28f22079
Now your merg
> "Darrin" == Darrin Thompson <[EMAIL PROTECTED]> writes:
JimC> cg-merge: merge blocked: seeked from master `
Darrin> cg-seek master ?
:; cg seek master
On commit 514fd7fd01d378a7b5584c657d9807fc28f22079
-JimC
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body
Linus Torvalds wrote:
>Since you haven't merged A and B in the above, they _are_ needed, aren't
>they?
>
>
My original email wasn't worded quite right. I think you are tracking
what I'm trying to do... but here is a different view anyway:
time
|
1 A ---> B clone A to B
2 |
On Thu, 2005-07-14 at 14:04 -0400, James Cloos wrote:
> I'm getting this on my clone of linus' tree:
>
> ,
> | cg-merge: merge blocked: seeked from master
> `
>
> I've not found a way past it.
cg-seek master ?
--
Darrin
-
To unsubscribe from this list: send the line "unsubscribe git"
I'm getting this on my clone of linus' tree:
,
| cg-merge: merge blocked: seeked from master
`
I've not found a way past it.
Is there an easy way, or do I have still yet another borked lk clone?
(Borked clones would be much less of an issue if I had more bandwidth
than disk space, but a
On Thu, 14 Jul 2005, James Ketrenos wrote:
>
> The problem is that if I run:
>
> git-rev-list --objects B ^C
>
> It shows me all of the tree and commit objects but also gives a
> list of all of the files that changed between A and C as if they
> are needed to move C to B.
Since you haven'
I have the following tree path:
A C B
| |
| 3.|<--.
| | |
2.|-->' |
| |
1.|-->'
|
Where A is the root repository for my overlays. B was created by
cloning A (1)
B is where development has been progressing. Finding the set of
objects to move from A to B i
On Thu, 14 Jul 2005, Linus Torvalds wrote:
>
> I'll strace the dang thing.
It's the "Adding" case in git-merge-one-file-script, which does
git-checkout-cache -u -f -- "$4"
and it's because of this:
lstat64("DF", {st_mode=S_IFDIR|0775, st_size=4096, ...}) = 0
unlink("D
On Thu, 14 Jul 2005, Junio C Hamano wrote:
>
> The bisect search found that the commit
>
> Make "git-checkout" create files with O_EXCL
>
> makes the test t1005 fail. But it is getting late so I give up
> to figuire this out tonight.
Ahh, thanks for noticing.
It says
* expecti
Hi, Jerry Seutter wrote:
> I'd also like to include stuff about branches, but I haven't gotten my
> head wrapped around how they work yet. cg-branch-add expects a location
> after the branch name and I'm not sure what to give it.
Cogito branch creation is based on the idea that you have a diffe
On Thu, 14 Jul 2005, Russell King wrote:
>
> Actually, I should've left the sh -x /usr/bin/cg-diff drivers/serial/8250.c
> running a little longer. It's not the git-update-cache command which
> is taking the time, it's git-diff-cache.
Ok. git-diff-cache actually ends up reading your HEAD tree,
On Thu, 14 Jul 2005, Russell King wrote:
>
> cg-update origin
> and then I edited drivers/serial/8250.c
Hmm..
> it appears that cg-diff does a
>
> git-update-cache --refresh >/dev/null
>
> each time it's run, which is taking the bulk of the time. Also note
> that curiously, it exits
Catalin Marinas <[EMAIL PROTECTED]> wrote:
> One note about patch description. I would prefer to have the
> convention of the Linux kernel patches:
>
> ---
> Short description line
Probably without this line in the e-mail body since it is already in
the subject line.
--
Catalin
-
To unsubscribe
Bryan Larsen <[EMAIL PROTECTED]> wrote:
> The current version of stgit does not allow whitespace in filenames. This
> patch fixes that. It also speeds up operations on large filesets
> considerably.
>
> Signed-off-by: Bryan Larsen <[EMAIL PROTECTED]>
Applied. It will be visible tonight via the
I think I posted about this before, but I can't find it in my git
mailbox...
[EMAIL PROTECTED]:[linux-2.6-arm] $ cg-update origin
l
`../linux-2.6/.git/refs/heads/master' -> `.git/refs/heads/origin'
cp: cannot create link
`.git/objects/00/ae0c9f3bc24856e7c9fcdf690466f1bbe0a4df': File exists
cp: ca
On Thu, Jul 14, 2005 at 10:08:31AM +0100, Catalin Marinas wrote:
> Russell King <[EMAIL PROTECTED]> wrote:
> > it appears that cg-diff does a
> >
> > git-update-cache --refresh >/dev/null
> >
> > each time it's run, which is taking the bulk of the time. Also note
> > that curiously, it exits w
Russell King <[EMAIL PROTECTED]> wrote:
> it appears that cg-diff does a
>
> git-update-cache --refresh >/dev/null
>
> each time it's run, which is taking the bulk of the time. Also note
> that curiously, it exits with status 1.
Does git-ls-files --unmerged show any files?
--
Catalin
-
T
The bisect search found that the commit
Make "git-checkout" create files with O_EXCL
makes the test t1005 fail. But it is getting late so I give up
to figuire this out tonight.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
Adds --inetd command line argument that makes server run in inetd mode.
Signed-off-by: Alexey Nezhdanov <[EMAIL PROTECTED]>
---
diff --git a/daemon.c b/daemon.c
--- a/daemon.c
+++ b/daemon.c
@@ -3,7 +3,7 @@
#include
#include
-static const char daemon_usage[] = "git-daemon [--port=n]";
+stat
On Wed, Jul 13, 2005 at 06:51:30PM +0200, Matthias Urlichs wrote:
> Hi, Russell King wrote:
>
> > This says it all. 1min 22secs to generate a patch from a locally
> > modified but uncommitted file.
>
> I only get that when the index is out-of-date WRT the file modification
> dates, so cg-diff ha
On Wed, Jul 13, 2005 at 01:28:18PM -0700, Linus Torvalds wrote:
> On Wed, 13 Jul 2005, Russell King wrote:
> > This says it all. 1min 22secs to generate a patch from a locally
> > modified but uncommitted file.
>
> No, there's something else going on.
>
> Most likely that something forced a tota
Does it make that big difference if the commands are invoked via the
shell? I haven't run any tests.
It wasn't for the time difference that I bypassed the shell, it was to
support spaces and other strange characters in parameters. It's easy
to use spawnvp than it is to escape the paramete
This splits push-pull related commands into a separate
category. I think a bigger overhaul of the main index is
needed, but have not got around to it. Help is welcome.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
Documentation/git.txt | 65 ---
This adds documentation for 'smarter push' family of commands.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
Documentation/git-receive-pack.txt | 41
Documentation/git-send-pack.txt| 46
send-pack.c
This adds documentation for 'smarter pull' family of commands.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
Documentation/git-clone-pack.txt | 13 +--
Documentation/git-fetch-pack.txt | 73 +
Documentation/git-upload-pack.txt | 40
This adds documentation for creating packed archives, inspecting,
validating them, and unpacking them.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
Documentation/git-pack-objects.txt | 80 ++
Documentation/git-show-index.txt | 36 +++
On Wed, 2005-07-13 at 15:26 -0700, Junio C Hamano wrote:
> Catalin Marinas <[EMAIL PROTECTED]> writes:
>
> >> I'd very much like to stay on the same list. By the same logic, cogito
> >> should have it's own list as well...
> >
> > I'd like this too and it's probably OK with a low traffic (we'll
54 matches
Mail list logo
