On 8/19/05, Linus Torvalds <[EMAIL PROTECTED]> wrote:
> > And yet another question: the teammember who is pulling must 'switch'
> > the merging repo to the right branch, pull from the corresponding
> > remote repos of each teammember, and push to the public view of the
> > repo. Is that right?
>
>
On Fri, 19 Aug 2005, Martin Langhoff wrote:
>
> In the section 'Emulating CVS behaviour', where the team setup is
> described with a team 'merger'. What is not clear is how to deal with
> project-wide branches. Should they be created in the master repo, and
> everyone clone a new repo from it?
J
On Fri, 19 Aug 2005, Martin Langhoff wrote:
>
> Is there a way to convince cogito/git to leave reject files around?
Nope.
Git just doesn't deal in patches. There's never any patch rejects: there
are just two source files that get merged.
The ".orig" and ".rej" things are signs of patch-based
Sun's cc doesn't know __attribute__.
Signed-off-by: Jason Riedy <[EMAIL PROTECTED]>
---
cache.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
4181b19f615b3d56f9fae5f3accd435480aa7d2f
diff --git a/cache.h b/cache.h
--- a/cache.h
+++ b/cache.h
@@ -41,7 +41,7 @@
#endif
#ifndef __
Resolved. I was missing a call to git-update-server-info. It fails to
make the objects/info directory, so that had to be done manually.
GIT_DIR=~/public_html/repos/moodle.git git-update-server-info
error: cannot open
/home/martin/public_html/repos/moodle.git/objects/info/packs+
mkdir ~/pub
With todays git and cogito:
moodle-git-merge$ git-push-script --all ~/public_html/repos/moodle.git
This unpacked the repo completely, in spite if it being local. Anyway,
from a remote machine I could do cg-clone and it succeeded, though it
took ages:
cg-clone http://mltest/~martin/repos/mo
In the section 'Emulating CVS behaviour', where the team setup is
described with a team 'merger'. What is not clear is how to deal with
project-wide branches. Should they be created in the master repo, and
everyone clone a new repo from it?
With a team of 10 people, and perhaps 4 or 5 branches, th
Create an empty directory and running this script in there would
let you see the original Octopus in action.
---
#!/bin/sh
test -d .saved-git || {
U=http://www.kernel.org/pub/scm/git/git.git
GIT_DIR=.saved-git
export GIT_DIR
git-init-db
: >$GIT_DIR/FETCH_HEAD
h=0
whil
There are three hooks:
- 'pre-commit' is given an opportunity to inspect what is
being committed, before we invoke the EDITOR for the
commit message;
- 'commit-msg' is invoked on the commit log message after
the user prepares it;
- 'post-commit' is run after a succe
This script uses the list of heads and their origin multi-head "git
fetch" left in the $GIT_DIR/FETCH_HEAD file, and makes an octopus
merge on top of the current HEAD using them.
The implementation tries to be strict for the sake of safety. It
insists that your working tree is clean (no local cha
Linus Torvalds <[EMAIL PROTECTED]> writes:
> Well, Junio has been talking about adding commit hooks. I don't think
> that's been done.
No, notyet. But tonight.
> The only question is what the hook/trigger should look like. just put
> something like
>
> [ -x .git/hooks/applypatch-hook ] &&
Sam Ravnborg <[EMAIL PROTECTED]> writes:
> I prefer to add it myself rather than to have it added automatically -
> but mayve thats you me being a bit mistrusting.
>
> The only git- command I use today is git-applymbox.
If you did not have that "add it myself" preference, I would
have recommended
Johannes Schindelin <[EMAIL PROTECTED]> writes:
>> The patch is for people who thinks the user who uses the "--all"
>> flag deserves the danger that comes with the convenience.
>>
>> Comments?
>
> This is a sane default behaviour. Maybe introduce yet another flag
> "--no-remove", which says that
On 8/18/05, Martin Langhoff <[EMAIL PROTECTED]> wrote:
> We have a small team of 3, and our main activity is to run local
To self: RTFM, specifically, Documentation/tutorial.txt
I had read it early on and either didn't get to the end of it, or had
forgotten already.
Apologies,
martin
-
To uns
On Fri, 19 Aug 2005, Paul Mackerras wrote:
>
> > Umm. git-rev-list really does everything. Rule of thumb: if you _ever_
> > need to look at any other internal git information, you're probably doing
> > something wrong, or you've missed yet another flag ;)
>
> I still look in [gitdir]/refs/tags/*
Hi,
On Fri, 19 Aug 2005, Paul Mackerras wrote:
> Linus Torvalds writes:
>
> > Paul, I hate to tell you about yet another flag [...]
But why? You're doing such a fine job telling people about flags :-)
> > Umm. git-rev-list really does everything. Rule of thumb: if you _ever_
> > need to look a
Linus Torvalds writes:
> Paul, I hate to tell you about yet another flag to git-rev-list, but did
> you realize that in addition to all the other magic flags, there's a flag
> called "--parents"?
Cool. I didn't realize that. The current version uses it now.
> Umm. git-rev-list really does ev
>Yup. Think of it as a good exercise in git ;)
Fixed now (I hope).
-Tony
-
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
Hi,
On Thu, 18 Aug 2005, Linus Torvalds wrote:
> Btw, it's a shame that git has all these "git rebase" etc helper scripts,
> which rebase whole series of patches, but the simple "git re-do" which
> basically ends up being a
>
> git-diff-tree -p $old | git-apply --index &&
>
On Thu, 18 Aug 2005, Luck, Tony wrote:
>
> Yes I had a failed merge ... I thought that I had cleaned up from it, but
> clearly I hadn't. Bother.
The simplest way of cleaning up after a failed merge is just a simple "git
reset", which will also tell you if you need to perhaps clean up
afterward
>Now, I suspect you didn't mean to commit that thing: it really looks like
>you've mixed up your patches somehow, because the commit message seems to
>match only a very small portion of the patch.
>
>Did you perhaps have a failed merge or something that was in your index
>when you applied that
This makes git-applymbox verify that the index matches the current HEAD
before it starts applying patches.
Otherwise, you might have updated the index with unrelated changes, and
the first patch will commit not just the patch from the mbox, but also any
changes you had in your index.
Signed-o
"Luck, Tony" <[EMAIL PROTECTED]> writes:
> $ git-whatchanged -p test ^linus | diffstat -p1
> $ git-diff-tree -p linus test | diffstat -p1
git-whatchanged internally uses git-rev-list which skips merge
commits. You need '-m' to cause it not to.
$ git-whatchanged -m -p linus..test | diffsta
On Thu, 18 Aug 2005, Luck, Tony wrote:
>
> The spurious changes reported by "git-whatchanged -p" are:
>
> > Documentation/acpi-hotkey.txt |3
> > Documentation/kernel-parameters.txt|5
> > drivers/acpi/osl.c |6
> > fs/jfs/inode.c
Thanks for committing my one-character patch. In the commit message you
said
> Come to think of
> it, maybe we should disallow symlink inside .git/refs hierarchy;
> we update the files there by creat/rename pair, so having
> symlinks would not work anyway when you do anything that would
> update
Hi,
On Thu, 18 Aug 2005, Daniel Barkalow wrote:
> On Thu, 18 Aug 2005, Johannes Schindelin wrote:
>
> > tree object::
> > - An object containing a list of blob and/or tree objects.
> > - (A tree usually corresponds to a directory without
> > - subdirectories).
> > + An object containing
Hi,
On Thu, 18 Aug 2005, Matthias Urlichs wrote:
> Hi, Johannes Schindelin wrote:
>
> > Subject: Subject: [PATCH] Updates to glossary
>
> Something is stuttering here -- one "Subject:" is quite sufficient.
Subject! Subject! Subject! ;-)
My bad.
Dscho
-
To unsubscribe from this list: send the
Hi, Johannes Schindelin wrote:
> Subject: Subject: [PATCH] Updates to glossary
Something is stuttering here -- one "Subject:" is quite sufficient.
--
Matthias Urlichs | {M:U} IT Design @ m-u-it.de | [EMAIL PROTECTED]
Disclaimer: The quote was selected randomly. Really. | http://smurf.nor
On Thu, 18 Aug 2005, Johannes Schindelin wrote:
> tree object::
> - An object containing a list of blob and/or tree objects.
> - (A tree usually corresponds to a directory without
> - subdirectories).
> + An object containing a list of file names and modes along with refs
> +
Yesterday I was all happy ... Linus pulled a couple of changes from
my tree, and after I did a pull back from his tree into my "linus"
tracking branch, my status scripts correctly identified the branches
that I'd been using to track those changes as being no longer needed.
But this morning I ran a
On Thu, 18 Aug 2005, Sam Ravnborg wrote:
>
> I almost always handedit my mails and I find myself forgetting to add
> "Signed-off-by" from time to time.
> Is there a simple way to implment a trigger that can check that _I_
> signed off the patch before applying it?
Well, Junio has been talking a
Hi,
I like stgit very much, but I feel there is still something missing:
stgit is very handy when you use it for patches which should be pushed to
mainline rather quickly. But for pacthes which won't be pushed immediately
to mainline, it would be usefull to have a history of the patches itself.
T
Changes to the descriptions of tree and tag objects, a link for ent, and
descriptions for rewind, rebase and core git were added.
Signed-off-by: Johannes Schindelin <[EMAIL PROTECTED]>
---
Documentation/glossary.txt | 28 ++--
1 files changed, 22 insertions(+), 6 deleti
> (Also, with proper "Signed-off-by:" lines it's also always clear that
> there were other people involved, and that the author of the patch is
> different from the person who applied it).
I almost always handedit my mails and I find myself forgetting to add
"Signed-off-by" from time to time.
Is
At Thu, 18 Aug 2005 17:36:07 +0200,
Sven Verdoolaege wrote:
>
> On Thu, Aug 18, 2005 at 11:30:41PM +0900, Yasushi SHOJI wrote:
> > Use instead of .
> >
>
> Hmm in snownews this gets displayed as "Use instead of .".
> (http://www.liacs.nl/~sverdool/gitweb.cgi?p=gitweb.git;a=rss)
>
> Is tha
Small fix (use "git branch" to make branches, rather than "git checkout -b").
Optimization for trivial patches (apply to release and merge to test).
Three sample scripts appended.
Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
---
diff --git a/Documentation/howto/using-topic-branches.txt
b/Docu
At Thu, 18 Aug 2005 18:01:09 +0200,
Kay Sievers wrote:
>
> On Thu, Aug 18, 2005 at 11:30:41PM +0900, Yasushi SHOJI wrote:
> > Use instead of .
> >
> > RSS 2.0 Specification doesn't have .
> > see http://blogs.law.harvard.edu/tech/rss
>
> See here:
> http://www.notestips.com/80256B3A007F2692/1
On Thu, Aug 18, 2005 at 11:43:03PM +0900, Yasushi SHOJI wrote:
> Hi all,
>
> with this patch and the privious one I just sent, you can run a pretty
> neat blog site with rss feed for geeks ;)
>
> one missing feature is the picture tag Junio asked a while ago ;P
>
> yashi
>
> Add a
On Thu, Aug 18, 2005 at 11:30:41PM +0900, Yasushi SHOJI wrote:
> Use instead of .
>
> RSS 2.0 Specification doesn't have .
> see http://blogs.law.harvard.edu/tech/rss
See here:
http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
The element is designed to contain plain text ONLY. When
On Thu, Aug 18, 2005 at 11:30:41PM +0900, Yasushi SHOJI wrote:
> Use instead of .
>
Hmm in snownews this gets displayed as "Use instead of .".
(http://www.liacs.nl/~sverdool/gitweb.cgi?p=gitweb.git;a=rss)
Is that a problem with snownews or with gitweb ?
skimo
-
To unsubscribe from this li
This also includes a script which does the sorting, and introduces
hyperlinks for every described term.
Signed-off-by: Johannes Schindelin <[EMAIL PROTECTED]>
---
Documentation/Makefile |7 +++-
Documentation/sort_glossary.pl | 70
2 files c
cg-help has the following in it
print_command_listing()
{
for command in "$@"; do
[ -f "$command" -a ! -L "$command" ] || continue
cmdname=$(basename $command)
...
}
I was wondering what the [ -f "$command" -o ! -L "$command" ] is
trying to test for. I
Hi all,
with this patch and the privious one I just sent, you can run a pretty
neat blog site with rss feed for geeks ;)
one missing feature is the picture tag Junio asked a while ago ;P
yashi
Add and .
>From http://blogs.law.harvard.edu/tech/rss
author - Email address of the a
Use instead of .
RSS 2.0 Specification doesn't have .
see http://blogs.law.harvard.edu/tech/rss
I've tested this with Mozilla Thunderbird version 1.0.6 (20050802),
and seems to be working well.
Signed-off-by: Yasushi SHOJI <[EMAIL PROTECTED]>
---
gitweb.cgi |5 ++---
1 files changed, 2 in
Marco Costalba <[EMAIL PROTECTED]> wrote:
> I was thinking at two different kind of workflow, one were you are
> tracking a remote repository ( Linux kernel project like ) and one
> as single developer with both stable and develop lines ( qgit or
> StGIT ;-) projects like ).
There is another optio
Catalin Marinas wrote:
>>
>>If I uderstand correctly you never commit patches from StGIT stack directly
>>in your base git repository, in this example git HEAD, but you always round
>>trip to MAIN.
>
When I say 'you always round trip to MAIN', I mean you send patches
upstream and someone commits
Marco Costalba <[EMAIL PROTECTED]> wrote:
> Catalin Marinas wrote:
>>That's how you would normally do development on Linux using StGIT -
>>clone the mainline kernel, create patches in your StGIT tree and submit
>>them either via e-mail or ask the gatekeeper to pull directly from your
>>tree (assumi
Hi,
On Thu, 18 Aug 2005, Junio C Hamano wrote:
> After you deleted files from your working tree, automatic
> git-update-cache used when the "--all" flag is given to "git
> commit" barfs because it lacks the --remove flag.
>
> It can be argued that this is a feature; people should be
> careful an
On Thursday 18 August 2005 09:24, Junio C Hamano wrote:
> $ cat $GIT_DIR/remotes/www
> URL: http://www.kernel.org/pub/scm/git/git.git/
> Pull: master:ko-master pu:ko-pu
> Push: master:master pu:pu foo:bar
Isn't this mixing two kinds of information:
1) Some default/persisten
Linus Torvalds <[EMAIL PROTECTED]> writes:
> On Wed, 17 Aug 2005, Jeff Garzik wrote:
>>
>> 1) Fix applymbox such that it understands RFC822-valid Subject lines
>> which wrap across multiple text lines.
>
> It already should do this.
>
>> 2) Teach it to understand MIME, and not treat the MIME hea
Johannes Schindelin <[EMAIL PROTECTED]> wrote:
> maybe it is time for a quick run through the typical jobs you do with
> StGIT, much like what Jeff sent the other day?
I hope I will find some time this weekend and write some tutorials on
an StGIT wiki.
--
Catalin
-
To unsubscribe from this lis
Catalin Marinas wrote:
>
>The base of the StGIT stack in the HEAD repository (branch) should
>always be the head of the MAIN repository.
That's the point I missed, now it's more clear.
>
>That's how you would normally do development on Linux using StGIT -
>clone the mainline kernel, create patc
Hi, Martin Langhoff wrote:
> Or are we forced to run an 'integration' repo so that we work with a
> 'star' arrangement? I am actually trying to avoid needing a central
> repo if possible.
Personally, I like the idea of an integration repository. The main reason
is that it avoids duplicate work an
Hi, Horst von Brand wrote:
> And teach make(1) about checking out files from git... or just create a
> co(1) command for git.
Ummm... why?
make's SCCS support depends on the presence of a SCCS/s. file
for each . We don't have that. Teaching make about git would be
equivalent to teaching it about
After you deleted files from your working tree, automatic
git-update-cache used when the "--all" flag is given to "git
commit" barfs because it lacks the --remove flag.
It can be argued that this is a feature; people should be
careful and something with a grave consequence like removing
files shou
This retires the git-parse-remote script, and allows pull to fetch
from multiple remote references. There is no support for resolving
more than two heads, so that would be next.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
Makefile |2 +
git-parse-remote | 79
All the necessary parsing code is in git-parse-remote-script;
update git-push-script to use it.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
Makefile|2 -
git-parse-remote-script | 122 +++
git-push-script | 28 +
Traditionally, fetch takes these forms:
$ git fetch
$ git fetch
$ git fetch tag
This patch updates it to take
$ git fetch ...
where:
- A of form ":" is to fetch the objects
needed for the remote ref that matches , and if
is not empty, store it as a local
Here is the current status of the multi-head download support.
[PATCH 1/3] Start adding the $GIT_DIR/remotes/ support.
[PATCH 2/3] Multi-head fetch.
[PATCH 3/3] Update git-pull to match updated git-fetch.
The first one in the series adds support for the long promised
$GIT_DIR/remotes/
59 matches
Mail list logo
