When we resolve a merge between two branches, and it removes a file in the
current branch, we notify the person doing the resolve with a big nice
notice like
Removing xyzzy
which is all well and good.
HOWEVER, we also do this when the file was actually removed in the current
branch,
Reverting an existing commit
One of the changes I pulled into the 'master' branch turns out to
break building GIT with GCC 2.95. While they were well intentioned
portability fixes, keeping things working with gcc-2.95 was also
important. Here is what I did to revert
Linus Torvalds wrote:
> On Mon, 29 Aug 2005, A Large Angry SCM wrote:
>>Signed-off-by: <[EMAIL PROTECTED]>
>
> Btw, I enjoy your email address and name, but especially with something
> that is supposed to hopefully have some legal value down the line if
> somebody starts making SCO noises, it r
On Mon, 29 Aug 2005, A Large Angry SCM wrote:
>
> Signed-off-by: <[EMAIL PROTECTED]>
Btw, I enjoy your email address and name, but especially with something
that is supposed to hopefully have some legal value down the line if
somebody starts making SCO noises, it really would be nice to have
Setting the wraplength to zero keeps the bird from trimming WS.
Signed-off-by: <[EMAIL PROTECTED]>
---
Documentation/SubmittingPatches |8 ++--
1 files changed, 2 insertions(+), 6 deletions(-)
10c16a0043ea3bc1fd97b29bfb6ea62404c9790e
diff --git a/Documentation/SubmittingPatches b/Doc
Copy & paste source comments into documentation.
Signed-off-by: <[EMAIL PROTECTED]>
---
Documentation/git-request-pull-script.txt | 18 ++
1 files changed, 10 insertions(+), 8 deletions(-)
c309197099fceb12fa05d9aa23b0b7e5adf5f061
diff --git a/Documentation/git-request-pull-
Copy & paste source comments into documentation.
Signed-off-by: <[EMAIL PROTECTED]>
---
Documentation/git-daemon.txt | 26 +-
1 files changed, 17 insertions(+), 9 deletions(-)
ea71ec7bde99f05a3766f5e1ad4ecc7bcb89ab13
diff --git a/Documentation/git-daemon.txt b/Docum
Copy & paste source comments into documentation.
Signed-off-by: <[EMAIL PROTECTED]>
---
Documentation/git-applypatch.txt | 22 +-
1 files changed, 13 insertions(+), 9 deletions(-)
0c00e0e3bd83cc1297e2581cae66aeebc65e52a6
diff --git a/Documentation/git-applypatch.txt b/D
On Mon, 29 Aug 2005, Junio C Hamano wrote:
>
> The code is simple enough and I see some beauty in it, but I
> honor your veto, at least for now.
Well, I didn't actually veto it when I saw the feature the first time,
because I think it's a valid thing to do when applying patches by hand.
It wa
Junio C Hamano writes:
> The new output looks a lot less cluttering and I like it very
> much, but it is confusing to me on one count. I clicked one
> arrowhead pointing downward, expecting that the pane would jump
> scroll to show the counterpart arrowhead, and was dissapointed
> that it did not
Linus Torvalds <[EMAIL PROTECTED]> writes:
> On Mon, 29 Aug 2005, Junio C Hamano wrote:
>>
>> I, however, am not 100% convinced --ignore-applied is too
>> dangerous to be useful in any conceivable use cases, at least
>> not yet. For example, you might be cherry-picking a change from
>> a foreign
On Mon, 29 Aug 2005, Junio C Hamano wrote:
>
> I, however, am not 100% convinced --ignore-applied is too
> dangerous to be useful in any conceivable use cases, at least
> not yet. For example, you might be cherry-picking a change from
> a foreign branch with 'git-diff-tree -p other~45 | git app
Petr's tree in kernel.org hasn't been updated for 2 weeks, and we
haven't seen him on the list for about 2 weeks too. Is he on holiday
or otherwise MIA?
Yesterday I got a bunch of patches from a cow-orker to get cogito-0.13
debian build scripts to work correctly, and when I looked at the
cogito tr
Linus Torvalds <[EMAIL PROTECTED]> writes:
> Hmm. Anything that depends on "--ignore-applied" is fundamentally broken
> as an import tool. There's no way something like that can be valid, since
> it inhently means that somebody is trying to apply a patch that simple
> isn't applicable.
>
> Don't d
On Mon, 29 Aug 2005, Junio C Hamano wrote:
>
> > But if we allowed duplicate entries per stage, I think we could easily
> > just fold stage 2/3 into one stage, and just have entries in stage 2.
> > That would immediately mean that a three-way merge could be way.
>
> I suspect you are solvin
On Mon, 29 Aug 2005, Robert Fitzsimons wrote:
>
> I should have mentioned before, these changes are being used in a
> SourcePuller dump file to git import script I've been working on.
Hmm. Anything that depends on "--ignore-applied" is fundamentally broken
as an import tool. There's no way somet
Linus Torvalds <[EMAIL PROTECTED]> writes:
> Daniel,
> I'm not 100% sure what you're trying to do, but one thing that might work
> out is to just having multiple "stage 3" entries with the same pathname.
My understanding is that he is enhancing the current three-way
merge 'read-tree -m O A B' "
On Tue, 30 Aug 2005, Paul Mackerras wrote:
>
> What can one put in the alternates file? Just an absolute path, or
> does a relative path or a URL work too?
Only an absolute path.
URL's fundamentally do not work, and relative paths end up being parsed as
relative to where-ever the user happens
When the --check option was used with multiple patch files which
modify the same files, the patch can fail because the previously
modified contents aren't written to the disk.
So save the in memory patch contents across the processing of multiple
patch files. Added a new test case for --check wit
Allow the user to allow a patch which has some hunks (fragments)
already applied to succeed. Added test case and documentation.
Signed-off-by: Robert Fitzsimons <[EMAIL PROTECTED]>
---
Documentation/git-apply.txt |7 ++-
apply.c | 12 +
t/t4108-apply-ignor
A patch file (or stdin) which modifies the same file more then once
will fail to apply the patch correctly. In the worst case it will
apply some of the patch and leave an invalid output file(s).
apply.c has been changed to search for previously processed files and
use the in memory copy of the da
I should have mentioned before, these changes are being used in a
SourcePuller dump file to git import script I've been working on.
> I further wanted to apply the following to the proposed updates
> branch, but even with only the first one applied, it fails its
> own test, t4104-apply-complex.sh:
Linus Torvalds writes:
> echo /pub/scm/linux/kernel/git/torvalds/linux-2.6/objects >
> objects/info/alternates
Did that (s/linux-2.6/linux-2.6.git/ actually...)
What can one put in the alternates file? Just an absolute path, or
does a relative path or a URL work too?
> or similar. That
Ben Greear <[EMAIL PROTECTED]> writes:
> Is there a way to tell it to add all modified files (that git commit mentions)
> to the cache for commit, or do I have to not be so lazy and
> paste them all on the cmd line?
Perhaps 'git commit -a' is what you want (it is documented;
http://www.kernel.org
On Mon, 2005-08-29 at 10:03, Linus Torvalds wrote:
> (Both "git branch" and "git checkout -b " that reate a new
This of course, is Git's answer to the long standing
UNIX tradition. Whereas UNIX would creat() files,
Git will reate() branches.
> Linus
jdl
-
To uns
I started a fresh kernel git repository since I buggered
my old one...
I branched, applied patch, and ran git-update-cache.
Now, when I run git commit, I see a long list of files on which
evidently I need to run git-update-cache.
Is there a way to tell it to add all modified files (that git com
A Large Angry SCM <[EMAIL PROTECTED]> writes:
> ... (and for the maintainer to not be shy about asking for
> them).
Point taken.
-
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
Dave Hansen <[EMAIL PROTECTED]> writes:
> I know it's an ancient compiler, but last time I checked it is still
> faster at runtime than the 3.x versions. If it's not going to be
> supported, it would probably be nice to at least detect that in the
> build system. I've confirmed that it works jus
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Junio C Hamano wrote:
> This originally came from Frank Sorenson but with a bit of
> rework to allow future enhancement to the command without
> changing the external interface for removal part.
>
> With the '-a' option, all objects in the current rep
Junio C Hamano wrote:
A Large Angry SCM <[EMAIL PROTECTED]> writes:
Frank,
Can you produce a patch to update the git-repack-script documentation to
reflect the new functionality?
Not including the doc changes in the patch was my fault, but the
message was meant primarily as an explanation o
A Large Angry SCM <[EMAIL PROTECTED]> writes:
> Frank,
>
> Can you produce a patch to update the git-repack-script documentation to
> reflect the new functionality?
Not including the doc changes in the patch was my fault, but the
message was meant primarily as an explanation of what I meant,
not
On Mon, Aug 29, 2005 at 02:35:00AM -0700, Komal Shah wrote:
> Kay,
>
> I am able to setup gitweb tree for my linux-omap tree internally, but
> for this I am using $project_list equals to $projectroot. I want to add
> more projects, but I don't know how write/generate index.aux file?
Yeah, this wo
I know it's an ancient compiler, but last time I checked it is still
faster at runtime than the 3.x versions. If it's not going to be
supported, it would probably be nice to at least detect that in the
build system. I've confirmed that it works just fine with gcc 3.3.
[EMAIL PROTECTED]:~/bin/git
Junio C Hamano wrote:
This originally came from Frank Sorenson but with a bit of
rework to allow future enhancement to the command without
changing the external interface for removal part.
With the '-a' option, all objects in the current repository are
packed into a single pack. When the '-d' o
On Mon, 29 Aug 2005, Bryan O'Donoghue wrote:
>
> If I'm understanding, I update to a given git repository, branch locally
> based on tags and then I can checkout a branch locally, to make that the
> active branch.
Exactly. This is the difference between a tag and a branch: a tag is an
"immobile
On Mon, Aug 29, 2005 at 11:02:38AM -0700, Linus Torvalds wrote:
> The "objects/info/alternates" thing is an extension, which allows you to
> have a partial object store, and point to the "rest of it", and still have
> all the tools understand it and be able to parse the totality of it. So it
> d
On Mon, 29 Aug 2005, Ben Greear wrote:
>
> I tried 'git checkout ben_dev_rfcnt'. It took a few seconds and
> had no errors. But, the files created on my other branch still
> exist in the code tree, and I still see my patch in the
> existing files.. I would expect them to go away.
>
> I don't
On Mon, 29 Aug 2005, Russell King wrote:
>
> Is the expected filesystem layout documented somewhere online (_external_
> to the source code) ?
Nope, I don't think so.
> Alternatively, when changes occur to the repostory format, please can
> they be marked with some obvious subject so that fol
Linus Torvalds wrote:
On Mon, 29 Aug 2005, Ben Greear wrote:
I think I'm missing something fundamental though... I wanted to
change to the ben_dev_rfcnt branch to build a kernel without my
additional patch. git branch ben_dev_rfcnt seems to change
it fine, but all of the changes for reposito
On Mon, Aug 29, 2005 at 10:32:09AM -0700, Linus Torvalds wrote:
> On Mon, 29 Aug 2005, Paul Mackerras wrote:
> > Please do a pull from:
> >
> > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6.git
>
> Gaah.
>
> This is not a valid git repository.
>
> Guys, if you do partially
This originally came from Frank Sorenson but with a bit of
rework to allow future enhancement to the command without
changing the external interface for removal part.
With the '-a' option, all objects in the current repository are
packed into a single pack. When the '-d' option is given at the
sa
On Mon, 29 Aug 2005, Paul Mackerras wrote:
>
> Please do a pull from:
>
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6.git
Gaah.
This is not a valid git repository.
Guys, if you do partially populated repositories, _please_ make sure that
you still make it a valid git
Frank Sorenson <[EMAIL PROTECTED]> writes:
> It reduces the disk space requirement significantly (linux packs from
> 135MB to 73MB), and I'm seeing speed improvements as well (probably
> because cache-cold operation requires far less seeking, and the caching
> requirements are smaller).
>
> What a
Here is an example:
On lun, 2005-08-29 at 02:35 -0700, Komal Shah wrote:
> Kay,
>
> I am able to setup gitweb tree for my linux-omap tree internally, but
> for this I am using $project_list equals to $projectroot. I want to add
> more projects, but I don't know how write/generate index.aux file
Linus Torvalds wrote:
> git checkout -b bryan-mm v2.6.13-rc6
>
> (mental footnote: pronounce it as "git checkout new branch 'bryan-mm' at
> v2.6.13-rc3").
>
> [ You can also do the exact same thing by
>
> git branch bryan-mm v2.6.13-rc6
> git checkout bryan-mm
> And then
On Mon, 29 Aug 2005, Bryan O'Donoghue wrote:
>
> cg-tag-ls lists every version from 2.6.11 to the current 2.6.13
> inclusive. cg-tag-ls also lists kernel version 2.6.13-rc6. What I'm
> wondering is how exactly I set copy of the tree to that version, so that
> I can apply the -mm patchset ?
You
On Mon, 29 Aug 2005, Ben Greear wrote:
>
> I think I'm missing something fundamental though... I wanted to
> change to the ben_dev_rfcnt branch to build a kernel without my
> additional patch. git branch ben_dev_rfcnt seems to change
> it fine, but all of the changes for repository 'foo' are a
On 8/29/05, Ben Greear <[EMAIL PROTECTED]> wrote:
> I think I'm missing something fundamental though... I wanted to
> change to the ben_dev_rfcnt branch to build a kernel without my
> additional patch. git branch ben_dev_rfcnt seems to change
> it fine, but all of the changes for repository 'foo'
On 8/29/05, Ben Greear <[EMAIL PROTECTED]> wrote:
> I created a new branch 'ben_dev_rfcnt'.
>
> Now, I also have another patch that I wanted to pull into git.
>
> Before merging this, I created another branch 'foo'.
>
> I changed to this branch foo and imported my patch and resolved the
> confli
Greetings all.
I have a copy of
http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
which is currently at revision 2.6.13 as at this morning.
cg-tag-ls lists every version from 2.6.11 to the current 2.6.13
inclusive. cg-tag-ls also lists kernel version 2.6.13-rc6. What I'm
wonde
Kay,
I am able to setup gitweb tree for my linux-omap tree internally, but
for this I am using $project_list equals to $projectroot. I want to add
more projects, but I don't know how write/generate index.aux file?
Me don't know much about cgi-bin/perl :(
---Komal Shah
http://komalshah.blogspot.c
Sorry, I am not very familiar with all those command line options:
Anyway, redo was easy:
with: --std=c9x
gcc-2.95 --std=c9x -pedantic -Wall -W -ofoo foo.c
foo.c:5: field `b' has incomplete type
foo.c: In function `main':
foo.c:20: warning: unknown conversion type character `z' in format
foo.c:20
Martijn Kuipers wrote:
> [EMAIL PROTECTED]:~$ gcc-2.95 --std=c99 -pedantic -Wall -W -ofoo foo.c
> cc1: unknown C standard `c99'
This makes this test a little less useful. Try with --std=c9x (GCC 2.95
is old enough not to know the standard by the "official" name).
According to GCC 3.0 C99 status
Hi,
I still had 2.95 on my machine (Debian). Results are:
[EMAIL PROTECTED]:~$ gcc-2.95 --version
2.95.4
[EMAIL PROTECTED]:~$ gcc-2.95 --std=c99 -pedantic -Wall -W -ofoo foo.c
cc1: unknown C standard `c99'
foo.c:5: field `b' has incomplete type
foo.c: In function `main':
foo.c:20: warning: unkn
Hello!
I've been trying out git and have some questions...
I installed the latest snapshot of git, pulled down the
kernel (2.6.13-rc7), and started hacking. What fun...got myself
a git patch and was happy.
Then, decided I wanted to branch off my changes from the
main tree so I could maintain t
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Junio C Hamano wrote:
> Frank Sorenson <[EMAIL PROTECTED]> writes:
>
>>This patch adds an option to git-repack-script to repack all objects,
>>including both packed and unpacked. This allows a full repack of
>>a git archive (current cogito packs from
On 8/27/05, Martin Langhoff <[EMAIL PROTECTED]> wrote:
> There is _one_ bug I've seen with cg-diff and I haven't had time to
> fix. On OSX, running cg-diff with no parameters doesn't show anything.
> For some reason, it fails to list the files. If you give it the paths
> explicitly, it'll give you
57 matches
Mail list logo
