Re: git error in tag ...: unterminated header

2015-06-25 Thread Wolfgang Denk
Dear Junio,

thanks for the fast replies.

In message xmqqegkzzoaz@gitster.dls.corp.google.com you wrote:
 
  Question is: how can we fix that?
 
 It could be that 4d0d8975 is buggy and barking at a non breakage.
 
 If there is no message in the tag, i.e.
 
 -- 8 --
 object 84ef51a632063e8cb57b2e9a4252497512831ffe
 type commit
 tag LABEL_2006_03_12_0025
 tagger Wolfgang Denk w...@pollux.denx.de 1142119613 +0100
 -- 8 --

It seems recent tools cannot create such tags any more?

 I do not offhand see why we want to require that there is a lone
 blank line at the end.

Hm... it seems I cannot even easily delte these tags:

- git tag -d LABEL_2006_03_12_0025
Deleted tag 'LABEL_2006_03_12_0025' (was eb394f5)
- git fsck --full
Checking object directories: 100% (256/256), done.
Checking object directories: 100% (256/256), done.
error in tag eb394f56db3e05d00891d6dc36a00df0025cf255: unterminated header
error in tag 9bf86baaa3b35b25baa2d664e2f7f6cafad689ee: unterminated header
error in tag c7071e6d645a8e13adb0d4cea2caad27213fa62f: unterminated header
error in tag eb394f56db3e05d00891d6dc36a00df0025cf255: unterminated header
error in tag 9bf86baaa3b35b25baa2d664e2f7f6cafad689ee: unterminated header
error in tag c7071e6d645a8e13adb0d4cea2caad27213fa62f: unterminated header
Checking objects: 100% (657288/657288), done.
Checking connectivity: 325718, done.
dangling tag eb394f56db3e05d00891d6dc36a00df0025cf255

Now I also have this dangling tag thingy...

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,  Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
An organization dries up if you don't challenge it with growth.
   - Mark Shepherd, former President and CEO of Texas Instruments
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


git error in tag ...: unterminated header

2015-06-25 Thread Wolfgang Denk
Hi all,

it turns out that recent versions of git (i. e. git version 2.2.0 or
later, resp. anything which includes commit 4d0d8975 Make sure
fsck_commit_buffer() does not run out of the buffer) throws errors on
our git repository  git://git.denx.de/u-boot:

- git fsck --full
Checking object directories: 100% (256/256), done.
error in tag eb394f56db3e05d00891d6dc36a00df0025cf255: unterminated header
error in tag 9bf86baaa3b35b25baa2d664e2f7f6cafad689ee: unterminated header
error in tag c7071e6d645a8e13adb0d4cea2caad27213fa62f: unterminated header
Checking objects: 100% (328644/328644), done.
Checking connectivity: 325719, done.

Apparently for some reason the tags  LABEL_2006_03_12_0025,
LABEL_2006_04_18_1106, and LABEL_2006_05_19_1133 are missing newlines,
which was undetected so far, but now is raised as an error.

Question is: how can we fix that?

Is there a tool to auto-repair such kind of errors?

If not, would it be be a harmless thing to just delete and recreate
the same tags (referring to the same commits)?  Or can anybody see any
problems tha might be caused by such a tag re-creation?  I mean, it is
not like a rebase of the repository or something like that?  Right?

Thanks in advance.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,  Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
Artificial Intelligence is the study of how to  make  real  computers
act like the ones in movies.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: sending changesets from the middle of a git tree

2005-08-16 Thread Wolfgang Denk
Hello,

in message [EMAIL PROTECTED] you wrote:
 
 This is the kind of situation I used to have all the time when
 Linus was the maintainer and I was a contributor, when you look
 at master branch being the maintainer branch, and pu
 branch being the contributor branch.  Your work started at the
...
 your changes) pu rather than merge.  So I ran git rebase:
 
 $ git checkout pu
 $ git rebase master pu

How do you handle conflicts in such a situation?

For example, I get:

- git rebase master testing-NAND
67a002cbe2b2850d76d797e679bc290a7df6
patching file common/cmd_nand.c
Hunk #2 FAILED at 18.
Hunk #3 succeeded at 335 (offset 1 line).
1 out of 4 hunks FAILED -- saving rejects to file common/cmd_nand.c.rej
external diff died, stopping at common/cmd_nand.c.
Some commits could not be rebased, check by hand:
67a002cbe2b2850d76d797e679bc290a7df6

OK, I can edit the file to resolve the conflicts. But what  do  I  do
then to continue?

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
...when fits of creativity run strong, more than  one  programmer  or
writer  has  been  known to abandon the desktop for the more spacious
floor. - Fred Brooks, Jr.
-
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


Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Wolfgang Denk
In message [EMAIL PROTECTED] you wrote:
 
 One thing that git cvsimport does not know to do is to show when a
 branch was merged back into the HEAD. That would be a very interesting
 thing to see, but I don't think there's any way to get that information
 out of CVS (so you'd have to basically make an educated guess by looking
 at the changes).
 
 So in a cvsimport, you'll never see a merge back to the head, even if one 
 technically took place. 

I asked this question before without receiving any reply:

Assume I know exactly where the merge back happenend - is  there  any
way to tell git about it, so I don't see all these dangling heads any
more?


Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
The number  of  Unix  installations  has  grown  to  10,  with  more
expected.- The Unix Programmer's Manual, 2nd Edition, June, 1972
-
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


Re: Switching heads and head vs branch after CVS import

2005-08-15 Thread Wolfgang Denk
In message [EMAIL PROTECTED] you wrote:

 If I find the time, I'll add some sort of pattern-match parameters to
 be tried against the commitmsg to extract likely head/branch names
 where we are merging from. My problem right now is that the only cvs
 repo with interesting branches and merges I have is huge, and takes an
 hour to import. That puts a damper on things, unfortunately.

In a first step, and to try things out, it might be sufficient if one
could feed in this information manually, like by providing a list  of
PatchSet ID's which are known to be merges ?

At least in my case where the number of branches and merges is  small
this would be completely satisfactory.

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
What is mind?  No matter.  What is matter?  Never mind.
  -- Thomas Hewitt Key, 1799-1875
-
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


(cogito) Branch offf from older commit?

2005-08-14 Thread Wolfgang Denk
Is there (in cogito) a way to  start  a  branch  off  from  an  older
commit?

Assume I receive a patch whichis based on an old version which I want
to test first (and resolve problems) in a separate branch.

This was what I tried:

* Clone main repo:
- cg-clone /git/u-boot u-boot-testing 
* Identify wanted branch point and seek to it:
- cd u-boot-testing
- cg-seek 024447b186cca55c2d803ab96b4c8f8674363b86
* Apply patch

Now how to proceed?

I can add  new  files  created  by  the  patch  using  cg-add,  but
cg-status  says  Changes recording BLOCKED: seeked from master, and
cg-commit says committing blocked: seeked from master, too.

However, when I now seek back I get this:

- cg-seek
Warning: uncommitted local changes, trying to bring them along

which then results in a couple of conflicts which are probably to  be
expected.



So I tried this (after throwing away and re-creating my cloned repo):

* Uncommit the commit following the one I want to keep:
- cg-admin-uncommit 342717f72a2f92a14b9c823546e5bcec244f8bf4
- cg-reset
* cg-status reports a couple of unknown files (those added later to
  the tree); I manually removed these
* Apply patch
* Check in modifications
* Clone another tree
- cg-clone /git/u-boot u-boot-test-merge
- cd u-boot-test-merge
* Create branch for the stuff to be tested
- cg-branch-add testing-NAND /work/u-boot-testing
* Pull and merge:
- cg-pull testing-NAND
- cg-merge testing-NAND


This works as intended, but seems to be a bit  circuitous  to  me;  I
think this is probably a pretty common situation and there might be a
simpler approach which I am missing?

[If possible I'd like to use cogito only, but if there  is  a  clever
way to do this using git-core commands I'm interested, too.]


Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
The price of curiosity is a terminal experience.
 - Terry Pratchett, _The Dark Side of the Sun_
-
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


Re: [OT?] git tools at SourceForge ?

2005-08-12 Thread Wolfgang Denk
In message [EMAIL PROTECTED] you wrote:

  The git architecture makes the central server less important, and it's 
  easy to run your own. Also, kernel.org is providing space to a set of 

Yes, cou can - but for a popular project like U-Boot in our case  you
don't really want to ;-)

  people with a large overlap with git users, since git hasn't been 
  particularly publicized and kernel.org is hosting git.
 
 I don't think he wants sourceforge to host git, I think he'd like
 sourceforge to provide access to source trees via git, instead of
 cvs.  Read that as, I want to do:

Correct, that's what I am looking for. My  hope  is  that  if  enough
people ask SF might actually provide such a service.

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Disc space - the final frontier!
-
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


Cannot build git RPM

2005-08-09 Thread Wolfgang Denk
Hello,

it is not possible to build RPMs from the current git code:

RPM build errors:
Installed (but unpackaged) file(s) found:
   /usr/share/git-core/templates/description
   /usr/share/git-core/templates/hooks/post-update
   /usr/share/git-core/templates/hooks/update
   /usr/share/git-core/templates/info/exclude
make: *** [rpm] Error 1


Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Computers are not intelligent.  They only think they are.
-
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


Re: Cannot install git RPM

2005-08-09 Thread Wolfgang Denk
I wrote:

 it is not possible to build RPMs from the current git code:
 
 RPM build errors:
 Installed (but unpackaged) file(s) found:
/usr/share/git-core/templates/description
/usr/share/git-core/templates/hooks/post-update
/usr/share/git-core/templates/hooks/update
/usr/share/git-core/templates/info/exclude
 make: *** [rpm] Error 1

A simple fix is of course:

- diff -u git-core.spec.in.ORIG git-core.spec.in
--- git-core.spec.in.ORIG   2005-08-09 10:26:50.845877000 +0200
+++ git-core.spec.in2005-08-09 12:42:06.872310918 +0200
@@ -40,6 +40,7 @@
 %{!?_without_docs: %doc Documentation/*.html }
 %{!?_without_docs: %{_mandir}/man1/*.1.gz}
 %{!?_without_docs: %{_mandir}/man7/*.7.gz}
+/usr/share/git-core/templates/*
 
 %changelog
 * Thu Jul 14 2005 Eric Biederman [EMAIL PROTECTED]


But the resulting RPM cannot be installed either,  at  least  not  in
standard Fedora Core 2/3/4 installations:

error: Failed dependencies:
perl(Email::Valid) is needed by git-core-0.99.3-1
perl(Mail::Sendmail) is needed by git-core-0.99.3-1


Seems git is depending on more and more stuff which is not  available
in standard distros. This makes it not easier for new users...

Is there at least some  documentation  which  external  packages  are
needed, and where to find these?

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
There are three principal ways to lose money: wine, women,  and  en-
gineers.  While  the first two are more pleasant, the third is by far
the more certain.  -- Baron Rothschild, ca. 1800
-
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


Can't build RPM's from current cogito tree

2005-08-04 Thread Wolfgang Denk
Building of RPM's from the current cogito tree fails:

- rpmbuild -ba cogito.spec 
...
make -C tools install
make[1]: Entering directory `/usr/local/BUILD/cogito-0.12.1/tools'
gcc -g -O2 -Wall -o git-mailsplit mailsplit.c
gcc -g -O2 -Wall -o git-mailinfo mailinfo.c
install -m755 -d /usr/bin
install: cannot change permissions of `/usr/bin': Operation not permitted
make[1]: *** [install] Error 1
make[1]: Leaving directory `/usr/local/BUILD/cogito-0.12.1/tools'
make: *** [install-tools] Error 2
error: Bad exit status from /var/tmp/rpm-tmp.6363 (%install)


This fixes it:

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -245,10 +245,10 @@ install-cogito: $(SCRIPT) $(LIB_SCRIPT) 
done
 
 install-tools:
-   $(MAKE) -C tools install
+   $(MAKE) -C tools dest=$(DESTDIR) install
 
 install-doc:
-   $(MAKE) -C Documentation install
+   $(MAKE) -C Documentation dest=$(DESTDIR) install
 
 uninstall:
cd $(DESTDIR)$(bindir)  rm -f $(PROG) $(SCRIPTS) $(SCRIPT) 
$(GEN_SCRIPT)


Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Every program has at least one bug and can be shortened by  at  least
one  instruction  --  from  which,  by induction, one can deduce that
every program can be reduced to one instruction which doesn't work.
-
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


cogito: problems in read-only trees

2005-08-03 Thread Wolfgang Denk
Hello,

sometimes I have to  work  in  trees  for  which  I  have  only  read
permissions; cogito has problems then - for example:

- cg-diff 
fatal: unable to create new cachefile
fatal: unable to create temp-file

It would be nice if there was at least a way to specify  some  TMPDIR
instead of the current directory in such a situation.

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Include the success of others in your dreams for your own success.
-
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


Re: Should cg-mkpatch output be usable with cg-patch?

2005-07-24 Thread Wolfgang Denk
In message [EMAIL PROTECTED] you wrote:

  I wander what I should do with cg-mkpatch generated output;  I  had
  the  impression that this should be usable with cg-patch, but these
  are incompatible with each other.
 
 They certainly aren't.

Is this a problem with the current implementation, or intentional?

  diff --git a/tools/img2brec.sh b/tools/img2brec.sh
  old mode 100644
  new mode 100755
  ...
  If I feed this into cg-patch, I get:
  patch:  Only garbage was found in the patch input.
 
 And did the changes apply? :-)

No, they did not. No file modes were changed.

 The message is surely confusing, but appeared to be rather corner-casy
 and after I imagined the required complexity of filtering this, I
 decided to spend my time on something more useful for the time being. :)

I don't think this is a corner case. I think it is  pretty  important
to be able to promote permissiong changes.


Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Too many people are ready to carry the stool when the piano needs  to
be moved.
-
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


Should cg-mkpatch output be usable with cg-patch?

2005-07-20 Thread Wolfgang Denk
I wander what I should do with cg-mkpatch generated output;  I  had
the  impression that this should be usable with cg-patch, but these
are incompatible with each other. Forexample. if  a  commit  contains
permission changes, my generated patch may look like this:

...
diff --git a/MAKEALL b/MAKEALL
old mode 100644
new mode 100755
diff --git a/mkconfig b/mkconfig
old mode 100644
new mode 100755
diff --git a/tools/img2brec.sh b/tools/img2brec.sh
old mode 100644
new mode 100755
...

If I feed this into cg-patch, I get:

patch:  Only garbage was found in the patch input.

- rpm -q cogito
cogito-0.12.1-1


Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
I really hate this damned machine It never does quite what I want
I wish that they would sell it.  But only what I tell it.
-
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


git cvsimport with branches?

2005-07-17 Thread Wolfgang Denk
Is there a way to make git cvsimport create branches in git for any
branches it encounters in the CVS repository?

All my imports so far show just a linear line of development, and CVS
branch information seems lost.

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Little known fact about Middle Earth:   The Hobbits had a very sophi-
sticated computer network!   It was a Tolkien Ring...
-
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


Re: git cvsimport with branches?

2005-07-17 Thread Wolfgang Denk
In message [EMAIL PROTECTED] you wrote:

  All my imports so far show just a linear line of development, and CVS
  branch information seems lost.
 
 Umm, exactly what did you do to visualize that? gitk origin obvioously
 shows only one branch, because CVS doesn't have merge infe. Use
 gitk $(cat .git/revs/heads/*) to show everything.

s/v/f/

I see. Thanks for pointing out. Umm... is there  a  way  to  manually
adjust  this  later?  I  can  identify the specific PatchSet(s) which
merge my CVS branches back into the trunk.

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Either one of us, by himself, is expendable.  Both of us are not.
-- Kirk, The Devil in the Dark, stardate 3196.1
-
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


Cannot get git any more?

2005-07-17 Thread Wolfgang Denk
Hi,

I cannot access the git repositorey any more:

- rpm -q cogito
cogito-0.12.1-1
- cd git
- cat .git/branches/origin 
rsync://rsync.kernel.org/pub/scm/git/git.git
- cg-update
@ERROR: Unknown module 'pub'
rsync: connection unexpectedly closed (41 bytes read so far)
rsync error: error in rsync protocol data stream (code 12) at io.c(342)
cg-pull: unable to get the head pointer of branch master

- cd ..
- mv git git.OLD
- cg-clone rsync://rsync.kernel.org/pub/scm/git/git.git
/usr/local/src/git
defaulting to local storage area
@ERROR: Unknown module 'pub'
rsync: connection unexpectedly closed (41 bytes read so far)
rsync error: error in rsync protocol data stream (code 12) at io.c(342)
cg-pull: unable to get the head pointer of branch master
cg-init: pull failed

- rm -fr git
- cg-clone http://www.kernel.org/pub/scm/git/git.git
/usr/local/src/git
defaulting to local storage area
00:44:43 URL:http://www.kernel.org/pub/scm/git/git.git/refs/heads/master 
[41/41] - refs/heads/origin [1]
progress: 2 objects, 4252 bytes
error: File 6ff87c4664981e4397625791c8ea3bbb5f2279a3 
(http://www.kernel.org/pub/scm/git/git.git/objects/6f/f87c4664981e4397625791c8ea3bbb5f2279a3)
 corrupt

Cannot obtain needed blob 6ff87c4664981e4397625791c8ea3bbb5f2279a3
while processing commit .
cg-pull: objects pull failed
cg-init: pull failed


Am I missing something?

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
It's all Klatchian to me.
- Terry Pratchett  Stephen Briggs, _The Discworld Companion_
-
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


Re: New script: cg-clean

2005-07-08 Thread Wolfgang Denk
In message [EMAIL PROTECTED] Pavel Roskin wrote:
 
 Please consider this script for Cogito.
...
 # OPTIONS
 # ---
 # -i::
 # Clean files ignored by cg-status, such as object files.

May I suggest to give -i the standard --interactive meaning
(= prompt before removal) like with rm etc. ?

Thanks.


Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
How come everyone's going so slow if it's called rush hour?
-
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


Cogito-0.12: problem with local clone

2005-07-07 Thread Wolfgang Denk
Hello,

I have problems with Cogito-0.12 when trying to clone a local tree:

My original tree is in /git/u-boot-denx (imported from CVS); /git
is a directory mounted over NFS; all this is under Fedora Core  4  in
case it matters:

- cd /git/u-boot-denx
- cg-tag-ls
/git/u-boot-denx/.git/refs/tags
LABEL_2002_11_05_0120   405f4884816e733f8ba3675d2ead1b44fd4a2ad2
LABEL_2002_11_05_1735   a21c24faf81d6e2c2cf21bc856b97994a7fb0950
LABEL_2002_11_10_2310   90e51a047bc112515e1257077b4c898bedf29e69
...
U-Boot-1_1_1eaa609e49846203434aa3b20e7084c79e89ea952
U-Boot-1_1_23621a36bfb037a47a59b0c02d3686522c8d895bf
U_BOOT_0_1_0dc9791586a71cb80c255a830a38d4a2b092398c3
- cg-tag-ls | wc -l
131

When I try to create a local clone I get lots of error messages:

- mkdir git-local
- cd git-local
- cg-clone /git/u-boot-denx 
/home/wd/git/u-boot-denx
defaulting to local storage area
`/git/u-boot-denx/.git/refs/heads/master' - `.git/refs/heads/origin'
copy 9f94f652ff7a5be5263ca0ef35a512ac7f29be98
copy db88a44625a80f558bcde5aeda291c54c737b573
copy 30a7a8a8d49f7069403895f326de4905f63d8855
...
copy 9c2deccb2acfb1d0d77b733a3f19d12ea9d58ca2
copy f548442a0fe39729a11b1d384708c7cc3b6bed20
copy 2183da96d548c02bd4f99b05e673395f81212878
`/git/u-boot-denx/.git/refs/tags/U_BOOT_0_1_0' - 
`.git/refs/tags/U_BOOT_0_1_0'
cp: cannot create link `.git/refs/tags/U_BOOT_0_1_0': Invalid 
cross-device link
`/git/u-boot-denx/.git/refs/tags/LABEL_2002_11_05_0120' - 
`.git/refs/tags/LABEL_2002_11_05_0120'
cp: cannot create link `.git/refs/tags/LABEL_2002_11_05_0120': Invalid 
cross-device link
`/git/u-boot-denx/.git/refs/tags/LABEL_2002_11_05_1735' - 
`.git/refs/tags/LABEL_2002_11_05_1735'
cp: cannot create link `.git/refs/tags/LABEL_2002_11_05_1735': Invalid 
cross-device link
...
`/git/u-boot-denx/.git/refs/tags/LABEL_2005_06_20_2345' - 
`.git/refs/tags/LABEL_2005_06_20_2345'
cp: cannot create link `.git/refs/tags/LABEL_2005_06_20_2345': Invalid 
cross-device link
`/git/u-boot-denx/.git/refs/tags/LABEL_2005_07_04_0202' - 
`.git/refs/tags/LABEL_2005_07_04_0202'
cp: cannot create link `.git/refs/tags/LABEL_2005_07_04_0202': Invalid 
cross-device link
unable to get tags list (non-fatal)
/home/wd/git/u-boot-denx/.git/refs/tags
New branch: 9f94f652ff7a5be5263ca0ef35a512ac7f29be98
Cloned (origin /git/u-boot-denx available as branch origin)
Cloned to u-boot-denx/ (origin /git/u-boot-denx available as branch 
origin)

And the resulting tree is indeed missing lots of tags:

- cg-tag-ls
/home/wd/git/u-boot-denx.OLD/.git/refs/tags
LABEL_2003_06_28_0050-stablef50d58228a5be736e6ed0f8dd3202b9ea26169bf
LABEL_2003_06_28_0130-stabled8a9a48da39a79497d752d34d30b5edf3e3162a8
LABEL_2003_06_28_1800-stableb82064a05f9c88a6144dc8f894f9e312e134b6b3
U_BOOT_0_1_0d4e4163d86db0238264b7d06d9f023c16f1e371a
- cg-tag-ls | wc -l
5
- 


Am I doing something wrong?


Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
Include the success of others in your dreams for your own success.
-
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


Re: cvsimport: rewritten in Perl

2005-07-06 Thread Wolfgang Denk
In message [EMAIL PROTECTED] Linus Torvalds wrote:
 
 If you make it print out its pid and then pause, you can use 
 
   ls -l /proc/pid/fd/
 
 to get an idea of what the files may be. Looks like the new perl version 
 is leaking file descriptors..

It does. In case it's still of interest:  log file attached.

Best regards,

Wolfgang Denk


Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
It seems intuitively obvious to me, which  means  that  it  might  be
wrong. -- Chris Torek



git-cvsimport-script.log.gz
Description: git-cvsimport-script.log.gz


Re: cvsimport: rewritten in Perl

2005-07-05 Thread Wolfgang Denk
:1.5=after, board/rmu/rmu.c:1.3=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_12_08_MKR:
fs/fat/fat.c:1.5=after, board/tqm8260/tqm8260.c:1.4=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_12_08_MKR:
fs/fat/fat.c:1.5=after, board/tqm8xx/tqm8xx.c:1.4=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_12_08_MKR:
fs/fat/fat.c:1.5=after, include/version.h:1.20=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_12_08_MKR:
fs/fat/fat.c:1.5=after, lib_arm/board.c:1.19=before. Treated as 'before'
WARNING: Invalid PatchSet 815, Tag LABEL_2003_12_08_MKR:
include/configs/TQM823L.h:1.9=after, CHANGELOG:1.170=before. Treated as 
'before'
WARNING: Invalid PatchSet 815, Tag LABEL_2003_12_08_MKR:
board/tqm8xx/tqm8xx.c:1.5=after, CHANGELOG:1.170=before. Treated as 'before'
WARNING: Invalid PatchSet 815, Tag LABEL_2003_12_08_MKR:
Makefile:1.65=after, CHANGELOG:1.170=before. Treated as 'before'
WARNING: Invalid PatchSet 816, Tag LABEL_2003_12_08_MKR:
include/configs/rmu.h:1.4=after, CHANGELOG:1.171=before. Treated as 'before'
WARNING: Invalid PatchSet 815, Tag LABEL_2003_12_08_MKR:
README:1.60=after, CHANGELOG:1.170=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, CHANGELOG:1.165=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/RRvision/RRvision.c:1.2=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/atc/atc.c:1.6=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/c2mon/c2mon.c:1.2=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/etx094/etx094.c:1.2=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/evb64260/flash.c:1.5=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/rmu/rmu.c:1.3=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/tqm8260/tqm8260.c:1.4=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/tqm8xx/tqm8xx.c:1.4=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, include/version.h:1.20=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, lib_arm/board.c:1.19=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, CHANGELOG:1.165=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/RRvision/RRvision.c:1.2=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/atc/atc.c:1.6=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/c2mon/c2mon.c:1.2=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/etx094/etx094.c:1.2=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/evb64260/flash.c:1.5=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/rmu/rmu.c:1.3=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/tqm8260/tqm8260.c:1.4=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, board/tqm8xx/tqm8xx.c:1.4=before. Treated as 
'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, include/version.h:1.20=before. Treated as 'before'
WARNING: Invalid PatchSet 810, Tag LABEL_2003_11_26_MKR:
fs/fat/fat.c:1.5=after, lib_arm/board.c:1.19=before. Treated as 'before'
Committing initial tree 2183da96d548c02bd4f99b05e673395f81212878
Cannot create object: Too many open files
- ulimit -n
1024

Any ideas?


Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
It is easier to port a shell than a shell script.  - Larry Wall
-
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