* Re: Trial git RPM's..
From: Eric W. Biederman @ 2005-07-12 15:59 UTC (permalink / raw)
To: Chris Wright; +Cc: Linus Torvalds, Git Mailing List
In-Reply-To: <20050711210309.GT5324@shell0.pdx.osdl.net>
Chris Wright <chrisw@osdl.org> writes:
> * Linus Torvalds (torvalds@osdl.org) wrote:
>> > And it does not pass my torture test of building rpm's on debian,
>> > but that is not a huge problem.
>>
>> Ok, why is debian problematic? Is there some missing dependency or
>> something? I really haven't ever done an rpm, and the git rpm target was
>> all done by Chris Wright, so I don't have any clue at all. Again, patches
>> welcome.
>
> Heh debian rpm build...I missed that bit in Eric's message. Eric, care
> to give details?
Ok paged back in my state. The practical problem is that rpmbuild try
to lookup the build dependencies which simply aren't present on debian.
Patch will be along shortly once I get the glitches fixed.
One last issue with building packages. Some distros are still shipping
GNU interactive tools so git as a package name for the rpm is problematic.
At the very least it is extremely confusing that git-0.99 is a more
recent package that git-4.3.20.
Eric
^ permalink raw reply
* Re: Why is there no git-update-cache --modified (aka I give up)
From: Matthias Urlichs @ 2005-07-12 16:16 UTC (permalink / raw)
To: git
In-Reply-To: <20050712155316.GA5841@buici.com>
Hi, Marc Singer wrote:
> # git-update-cache `git-diff-cache | cut -f2`
g-d-c should have an option to print file names only. All that cutting
and argument-backtick-ing gets pretty nasty when there are a lot of files,
or if they contain special characters.
--
Matthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
- -
God is a perfect example of the kind of aberration that can result from
an untrained intellect combining with an unrestrained imagination.
-- Simon Ewins
^ permalink raw reply
* Darcs-git wiki page
From: Juliusz Chroboczek @ 2005-07-12 16:22 UTC (permalink / raw)
To: darcs-users; +Cc: git
http://www.darcs.net/DarcsWiki/DarcsGit
You're welcome to leave any questions you might have -- I'll try to
answer.
Juliusz
^ permalink raw reply
* Re: Bootstrapping into git, commit gripes at me
From: Matthias Urlichs @ 2005-07-12 16:29 UTC (permalink / raw)
To: git
In-Reply-To: <7vy88c5r4w.fsf@assigned-by-dhcp.cox.net>
Hi, Junio C Hamano wrote:
> Having said that, I do like the concept of keeping track of
> "which development line are we on, and what's most recent in
> it". The way I read your description of cg-seek, you currently
> have that information is either in .git/head-name and
> .git/refs/heads/<head-name> pair (when .git/head-name exists),
> or .git/HEAD.
Personally, I'd rather have as few invariants as possible, so that various
Porcelains can agree on semantics.
What I would expect from a sane .git tree is that
* .git/HEAD contains the commit that is currently checked out.
* If HEAD is not a symlink, then switching to a branch HEAD is not a part
of should emit a warning.
("fsck to find the dangling commits" is not an answer ;-)
Ideas like
* remember the branch to un-seek back to
or
* treat HEAD as read-only when there's a seek active
seem to be optional / Porcelain-specific.
--
Matthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
- -
"We'll strategically withdraw to previously prepared position."
"Who prepared them?"
"we'll prepare them when we get there."
-- Terry Pratchett (Reaper Man)
^ permalink raw reply
* Re: Bootstrapping into git, commit gripes at me
From: Linus Torvalds @ 2005-07-12 16:48 UTC (permalink / raw)
To: Petr Baudis; +Cc: Marc Singer, Junio C Hamano, Git Mailing List
In-Reply-To: <20050712074801.GD6363@pasky.ji.cz>
On Tue, 12 Jul 2005, Petr Baudis wrote:
>
> Could we please have the branch name written to .git/head-name in case
> we switch the branch?
I wouldn't mind per se, but on the other hand I really _hate_ having
"parallel" information that can get out of sync. If you have two places
holding the same information, they had better match. And this is something
that sounds like it could very easily start to not match, and then we're
screwed.
So I'd _much_ rather see instead:
- .git/head-name is a cogito-specific thing that is only active while
cogito is _seeking_. So then "cg-unseek" ends up being pretty much
equivalent to
[ -e .git/head-name ] || die "You weren't seeking"
git checkout $(cat .git/head-name)
rm .git/head-name
This way "head-name" is really never even supposed to be "in sync" with
.git/HEAD, and there are no synchronization issues.
- in order for a "git checkout" to not get confused and possibly throwing
a cogito temporary head away (and so that git-fsck-cache is happy
during a seek), would it be possible to make "seek" use a real
temporary branch instead? Ie, "cg-seek" would be something like
[ -e .git/head-name ] && die "You are already seeking"
readlink .git/HEAD > .git/head-name
echo $seekpoint > .git/refs/heads/cg-seek-point
git checkout -f cg-seek-point
or similar?
Then "cg-seek" and "cg-unseek" would continue to work, but the core git
layer would never be confused because they're really using normal
branches?
Linus
^ permalink raw reply
* Re: Trial git RPM's..
From: Linus Torvalds @ 2005-07-12 17:01 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: Chris Wright, Git Mailing List
In-Reply-To: <m1zmssyq0r.fsf@ebiederm.dsl.xmission.com>
On Tue, 12 Jul 2005, Eric W. Biederman wrote:
>
> One last issue with building packages. Some distros are still shipping
> GNU interactive tools so git as a package name for the rpm is problematic.
> At the very least it is extremely confusing that git-0.99 is a more
> recent package that git-4.3.20.
Ahh. Dang, I should have remembered this. We should call the rpm
"git-core-0.99", not just "git-0.99".
Chris, I assume this is just changing the name in the spec-file from "git"
to "git-core"?
Linus
^ permalink raw reply
* Re: Trial git RPM's..
From: Eric W. Biederman @ 2005-07-12 17:14 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Chris Wright, Git Mailing List
In-Reply-To: <Pine.LNX.4.58.0507120959550.17536@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> Ahh. Dang, I should have remembered this. We should call the rpm
> "git-core-0.99", not just "git-0.99".
>
> Chris, I assume this is just changing the name in the spec-file from "git"
> to "git-core"?
The name of the tarball needs to be updated as well.
Eric
^ permalink raw reply
* Re: [RFC] Design for http-pull on repo with packs
From: Dan Holmsand @ 2005-07-12 17:21 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Daniel Barkalow, torvalds, git
In-Reply-To: <7vu0j0ncnr.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> Dan Holmsand <holmsand@gmail.com> writes:
>>Repacking all of that to a single pack file gives, somewhat
>>surprisingly, a pack size of 62M (+ 1.3M index). In other words, the
>>cost of getting all those branches, and all of the new stuff from
>>Linus, turns out to be *negative* (probably due to some strange
>>deltification coincidence).
>
>
> We do _not_ want to optimize for initial slurps into empty
> repositories. Quite the opposite. We want to optimize for
> allowing quick updates of reasonably up-to-date developer repos.
> If initial slurps are _also_ efficient then that is an added
> bonus; that is something the baseline big pack (60M Linus pack)
> would give us already. So repacking everything into a single
> pack nightly is _not_ what we want to do, even though that would
> give the maximum compression ;-). I know you understand this,
> but just stating the second of the above paragraphs would give
> casual readers a wrong impression.
I agree, to a point: I think the bonus is quite nice to have... As it
is, it's actually faster on my machine to clone a fresh tree of Linus'
than it is to "git clone" a local tree (without doing the hardlinking
"cheating", that is). And it's kind of nice to have the option to start
completely fresh.
Anyway, my point is this: to make pulling efficient, we should ideally
have (1) as few object files to pull as possible, especially when using
http, and (2) have as few packs as possible, to gain some compression
for those who pull more seldom. Point 1 is obviously the most important one.
To make this happen, relatively frequent repacking and re-repacking
(even if only on parts of the repository) would be necessary. Or at
least nice to have...
Which was why I wanted the "dumb fetch" thingies to at least do some
"relatively smart un/repacking" to avoid duplication. And, ideally, that
they would avoid downloading entire packs that we just want the
beginning of. That would lessen the cost of repacking, which I happen to
think is a good thing.
Also, it's kind of strange when the ssh/local fetching *always* unpacks
everything, and rsync/http *never* does this...
> You are correct. For somebody like Jeff, having the Linus
> baseline pack with one pack of all of his head (incremental that
> excludes what is already in the Linus baseline pack) would help
> pullers.
That would work, of course. It, however, means that Linus becomes the
"official repository maintainer" in a way that doesn't feel very
distributed. Perhaps then Linus' packs should be marked "official" in
some way?
>>The big problem, however, comes when Jeff (or anyone else) decides to
>>repack. Then, if you fetch both his repo and Linus', you might end up
>>with several really big pack files, that mostly overlap. That could
>>easily mean storing most objects many times, if you don't do some
>>smart selective un/repacking when fetching.
>
>
> Indeed. Overlapping packs is a possibility, but my gut feeling
> is that it would not be too bad, if things are arranged so that
> packs are expanded-and-then-repacked _very_ rarely if ever.
> Instead, at least for your public repository, if you only repack
> incrementally I think you would be OK.
To be exact, you're ok (in the meaning of avoiding duplicates) as long
as you always rsync in the "official packs", and coordinate with others
you're merging with, before you do any repacking of your own. Sure, this
works. It just feels a bit "un-distributed" for my personal taste...
/dan
^ permalink raw reply
* Re: Trial git RPM's..
From: Linus Torvalds @ 2005-07-12 17:27 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: Chris Wright, Git Mailing List
In-Reply-To: <m1vf3gymi4.fsf@ebiederm.dsl.xmission.com>
On Tue, 12 Jul 2005, Eric W. Biederman wrote:
>
> The name of the tarball needs to be updated as well.
Yes, I noticed.
I ended up renaming the spec-file too.
Pushed out,
Linus
^ permalink raw reply
* Re: Trial git RPM's..
From: Chris Wright @ 2005-07-12 17:46 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Eric W. Biederman, Chris Wright, Git Mailing List
In-Reply-To: <Pine.LNX.4.58.0507121027120.17536@g5.osdl.org>
* Linus Torvalds (torvalds@osdl.org) wrote:
> On Tue, 12 Jul 2005, Eric W. Biederman wrote:
> > The name of the tarball needs to be updated as well.
>
> Yes, I noticed.
>
> I ended up renaming the spec-file too.
>
> Pushed out,
Yup, looks good.
-chris
^ permalink raw reply
* Re: [PATCH] remove Obsoletes from cogito.spec.in
From: Chris Wright @ 2005-07-12 18:17 UTC (permalink / raw)
To: Petr Baudis; +Cc: Chris Wright, git
In-Reply-To: <20050712073022.GB6363@pasky.ji.cz>
* Petr Baudis (pasky@suse.cz) wrote:
> where Chris Wright <chrisw@osdl.org> told me that...
> > This is leftover from early naming, and is no longer relevant.
> >
> > Signed-off-by: Chris Wright <chrisw@osdl.org>
>
> Thanks, applied. BTW, Josh Boyer of Fedora suggested having the
>
> Provides: git
>
> line in cogito.spec.in as long as it comes with git bundled (which will
> be so until git stabilizes, doesn't break backwards compatibility once
> in a while, and gets into some regular and reasonably frequent release
> cycle). What do you think?
Hmm, in an ideal world all of those stipulations are right around the
corner. Also, if the split is done, then cogito can depend on a specific
version of git-core, to help isolate against those upstream changes.
The main thing then is getting any local changes you have pushed to
Linus' git tree (if there are still any).
Adding Provides is probably only useful if there's some other package
that's relying on git being there (i.e. gitweb perhaps). I guess we
can add that, and remove it when there's proper dependencies in order.
May as well do git-core as is now done in git.
thanks,
-chris
--
Mark cogito rpm package as providing git-core, since it currently does.
Signed-off-by: Chris Wright <chrisw@osdl.org>
---
diff --git a/cogito.spec.in b/cogito.spec.in
--- a/cogito.spec.in
+++ b/cogito.spec.in
@@ -10,6 +10,7 @@ Source: http://kernel.org/pub/software/
BuildRequires: zlib-devel, openssl-devel, curl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prereq: sh-utils, diffutils, rsync, rcs, mktemp >= 1.5
+Provides: git-core
%description
GIT comes in two layers. The bottom layer is merely an extremely fast
^ permalink raw reply
* Compilation troubles
From: Dan Kohn @ 2005-07-12 18:33 UTC (permalink / raw)
To: git
I apologize for what are probably obvious compilation questions, but I
suspect other newbies are encountering them as well. I'm having trouble
installing cogito 0.12.1 on both a vanilla Ubuntu box and on my account
on a FreeBSD machine. I'm used to autoconf-built programs, so there's
probably just some simple library path I'm not setting up right. But
I'd appreciate your suggestions, and perhaps we can add the answer to
the INSTALL file.
UBUNTU 5.04
I used synaptics to install openssl, zlib, and curl, but cogito can't
seem to see them.
root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 # make
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o read-cache.o
read-cache.c
In file included from read-cache.c:6:
cache.h:21:21: openssl/sha.h: No such file or directory
cache.h:22:18: zlib.h: No such file or directory
In file included from read-cache.c:6:
cache.h:169: error: syntax error before '*' token
read-cache.c: In function `verify_hdr':
read-cache.c:339: error: `SHA_CTX' undeclared (first use in this
function)
read-cache.c:339: error: (Each undeclared identifier is reported only
once
read-cache.c:339: error: for each function it appears in.)
read-cache.c:339: error: syntax error before "c"
read-cache.c:346: warning: implicit declaration of function `SHA1_Init'
read-cache.c:346: error: `c' undeclared (first use in this function)
read-cache.c:347: warning: implicit declaration of function
`SHA1_Update'
read-cache.c:348: warning: implicit declaration of function `SHA1_Final'
read-cache.c: At top level:
read-cache.c:408: error: syntax error before '*' token
read-cache.c: In function `ce_write':
read-cache.c:410: error: `len' undeclared (first use in this function)
read-cache.c:415: error: `data' undeclared (first use in this function)
read-cache.c:418: error: `context' undeclared (first use in this
function)
read-cache.c:419: error: `fd' undeclared (first use in this function)
read-cache.c: At top level:
read-cache.c:430: error: syntax error before '*' token
read-cache.c: In function `ce_flush':
read-cache.c:436: error: `context' undeclared (first use in this
function)
read-cache.c:442: error: `fd' undeclared (first use in this function)
read-cache.c: In function `write_cache':
read-cache.c:449: error: `SHA_CTX' undeclared (first use in this
function)
read-cache.c:449: error: syntax error before "c"
read-cache.c:461: error: `c' undeclared (first use in this function)
make: *** [read-cache.o] Error 1
root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 # locate openssl
/etc/ssl/openssl.cnf
[long list of python and docs elided]
/usr/share/man/man1/openssl.1ssl.gz
/usr/bin/openssl
/usr/bin/openssl_fips_fingerprint
/usr/lib/libgnutls-openssl.so.11.1.16
/usr/lib/libgnutls-openssl.so.11
/usr/lib/ssl/openssl.cnf
/usr/local/ssl/man/man1/openssl.1
/usr/local/ssl/bin/openssl
/usr/local/ssl/lib/pkgconfig/openssl.pc
/usr/local/ssl/include/openssl
/usr/local/ssl/include/openssl/e_os2.h
/usr/local/ssl/include/openssl/crypto.h
/usr/local/ssl/include/openssl/tmdiff.h
/usr/local/ssl/include/openssl/opensslv.h
/usr/local/ssl/include/openssl/opensslconf.h
/usr/local/ssl/include/openssl/ebcdic.h
/usr/local/ssl/include/openssl/symhacks.h
/usr/local/ssl/include/openssl/ossl_typ.h
/usr/local/ssl/include/openssl/objects.h
/usr/local/ssl/include/openssl/obj_mac.h
/usr/local/ssl/include/openssl/md2.h
/usr/local/ssl/include/openssl/md4.h
/usr/local/ssl/include/openssl/md5.h
/usr/local/ssl/include/openssl/sha.h
/usr/local/ssl/include/openssl/hmac.h
/usr/local/ssl/include/openssl/ripemd.h
/usr/local/ssl/include/openssl/des.h
/usr/local/ssl/include/openssl/des_old.h
/usr/local/ssl/include/openssl/aes.h
/usr/local/ssl/include/openssl/rc2.h
/usr/local/ssl/include/openssl/rc4.h
/usr/local/ssl/include/openssl/idea.h
/usr/local/ssl/include/openssl/blowfish.h
/usr/local/ssl/include/openssl/cast.h
/usr/local/ssl/include/openssl/bn.h
/usr/local/ssl/include/openssl/ec.h
/usr/local/ssl/include/openssl/rsa.h
/usr/local/ssl/include/openssl/dsa.h
/usr/local/ssl/include/openssl/ecdsa.h
/usr/local/ssl/include/openssl/dh.h
/usr/local/ssl/include/openssl/ecdh.h
/usr/local/ssl/include/openssl/dso.h
/usr/local/ssl/include/openssl/engine.h
/usr/local/ssl/include/openssl/buffer.h
/usr/local/ssl/include/openssl/bio.h
/usr/local/ssl/include/openssl/stack.h
/usr/local/ssl/include/openssl/safestack.h
/usr/local/ssl/include/openssl/lhash.h
/usr/local/ssl/include/openssl/rand.h
/usr/local/ssl/include/openssl/err.h
/usr/local/ssl/include/openssl/evp.h
/usr/local/ssl/include/openssl/asn1.h
/usr/local/ssl/include/openssl/asn1_mac.h
/usr/local/ssl/include/openssl/asn1t.h
/usr/local/ssl/include/openssl/pem.h
/usr/local/ssl/include/openssl/pem2.h
/usr/local/ssl/include/openssl/x509.h
/usr/local/ssl/include/openssl/x509_vfy.h
/usr/local/ssl/include/openssl/x509v3.h
/usr/local/ssl/include/openssl/conf.h
/usr/local/ssl/include/openssl/conf_api.h
/usr/local/ssl/include/openssl/txt_db.h
/usr/local/ssl/include/openssl/pkcs7.h
/usr/local/ssl/include/openssl/pkcs12.h
/usr/local/ssl/include/openssl/comp.h
/usr/local/ssl/include/openssl/ocsp.h
/usr/local/ssl/include/openssl/ui.h
/usr/local/ssl/include/openssl/ui_compat.h
/usr/local/ssl/include/openssl/krb5_asn.h
/usr/local/ssl/include/openssl/store.h
/usr/local/ssl/include/openssl/pqueue.h
/usr/local/ssl/include/openssl/pq_compat.h
/usr/local/ssl/include/openssl/ssl.h
/usr/local/ssl/include/openssl/ssl2.h
/usr/local/ssl/include/openssl/ssl3.h
/usr/local/ssl/include/openssl/ssl23.h
/usr/local/ssl/include/openssl/tls1.h
/usr/local/ssl/include/openssl/dtls1.h
/usr/local/ssl/include/openssl/kssl.h
/usr/local/ssl/openssl.cnf
root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 # locate zlib
1.9.79/program/python-core-2.3.4/lib/encodings/zlib_codec.py
1.9.79/program/python-core-2.3.4/lib/test/test_zlib.py
/media/windows/Program Files/Trillian/zlib1.dll
/var/lib/dpkg/info/zlib1g.postinst
/var/lib/dpkg/info/zlib1g.list
/var/lib/dpkg/info/zlib1g.preinst
/var/lib/dpkg/info/zlib1g.shlibs
/var/lib/dpkg/info/zlib1g.md5sums
/var/cache/apt/archives/zlib1g_1%3a1.2.2-4ubuntu1.1_i386.deb
/usr/share/doc/zlib1g
/usr/share/doc/zlib1g/changelog.gz
/usr/share/doc/zlib1g/README.gz
/usr/share/doc/zlib1g/README.Debian
/usr/share/doc/zlib1g/copyright
/usr/share/doc/zlib1g/changelog.Debian.gz
/usr/share/doc/python2.4/examples/Demo/zlib
/usr/share/doc/python2.4/examples/Demo/zlib/minigzip.py
/usr/share/doc/python2.4/examples/Demo/zlib/zlibdemo.py
/usr/include/linux/zlib.h
/usr/lib/python2.4/lib-dynload/zlib.so
/usr/lib/python2.4/encodings/zlib_codec.py
/usr/lib/python2.4/encodings/zlib_codec.pyc
/usr/lib/python2.4/encodings/zlib_codec.pyo
/usr/lib/win32/avizlib.dll
/lib/modules/2.6.10-5-386/kernel/lib/zlib_deflate
/lib/modules/2.6.10-5-386/kernel/lib/zlib_deflate/zlib_deflate.ko
root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 #
FREEBSD
I believe I need to modify the Makefile to find my libcurl, but I don't
know how. Also, it's probably worth mentioning in INSTALL that gmake is
necessary, for those machines that have both.
[emlis:~/src/cogito-0.12.1]$ make
"Makefile", line 109: Need an operator
"Makefile", line 112: Need an operator
"Makefile", line 115: Need an operator
"Makefile", line 116: Need an operator
"Makefile", line 119: Need an operator
"Makefile", line 120: Need an operator
"Makefile", line 123: Need an operator
"Makefile", line 126: Need an operator
"Makefile", line 127: Need an operator
"Makefile", line 162: Missing dependency operator
"Makefile", line 165: Need an operator
make: fatal errors encountered -- cannot continue
[emlis:~/src/cogito-0.12.1]$ gmake
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o read-cache.o
read-cache.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o sha1_file.o
sha1_file.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o usage.o usage.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o object.o
object.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o commit.o
commit.c
commit.c: In function `add_user_info':
commit.c:244: warning: field width is not type int (arg 4)
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o tree.o tree.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o blob.o blob.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o tag.o tag.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o date.o date.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o index.o index.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff-delta.o
diff-delta.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o patch-delta.o
patch-delta.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o entry.o entry.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o path.o path.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o epoch.o epoch.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o refs.o refs.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o csum-file.o
csum-file.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o pack-check.o
pack-check.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o pkt-line.o
pkt-line.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o connect.o
connect.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o strbuf.o
strbuf.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o quote.o quote.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff.o diff.c
diff.c: In function `parse_num':
diff.c:702: warning: value computed is not used
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
diffcore-rename.o diffcore-rename.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
diffcore-pickaxe.o diffcore-pickaxe.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
diffcore-pathspec.o diffcore-pathspec.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
diffcore-break.o diffcore-break.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
diffcore-order.o diffcore-order.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o count-delta.o
count-delta.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o gitenv.o
gitenv.c
ar rcs libgit.a read-cache.o sha1_file.o usage.o object.o commit.o
tree.o blob.o tag.o date.o index.o diff-delta.o patch-delta.o entry.o
path.o epoch.o refs.o csum-file.o pack-check.o pkt-line.o connect.o
strbuf.o quote.o diff.o diffcore-rename.o diffcore-pickaxe.o
diffcore-pathspec.o diffcore-break.o diffcore-order.o count-delta.o
gitenv.o epoch.o
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o update-cache.o
update-cache.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-update-cache
update-cache.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff-files.o
diff-files.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-diff-files
diff-files.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o init-db.o
init-db.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-init-db
init-db.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o write-tree.o
write-tree.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-write-tree
write-tree.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o read-tree.o
read-tree.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-read-tree
read-tree.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o commit-tree.o
commit-tree.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-commit-tree
commit-tree.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o cat-file.o
cat-file.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-cat-file
cat-file.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o fsck-cache.o
fsck-cache.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-fsck-cache
fsck-cache.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
checkout-cache.o checkout-cache.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-checkout-cache
checkout-cache.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff-tree.o
diff-tree.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-diff-tree
diff-tree.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o rev-tree.o
rev-tree.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-rev-tree
rev-tree.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o ls-files.o
ls-files.c
ls-files.c: In function `show_files':
ls-files.c:270: warning: unsigned int format, u_long arg (arg 3)
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-ls-files
ls-files.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o check-files.o
check-files.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-check-files
check-files.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o ls-tree.o
ls-tree.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-ls-tree
ls-tree.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o merge-base.o
merge-base.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-merge-base
merge-base.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o merge-cache.o
merge-cache.c
merge-cache.c: In function `merge_entry':
merge-cache.c:62: warning: unsigned int format, long unsigned int arg
(arg 3)
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-merge-cache
merge-cache.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o unpack-file.o
unpack-file.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-unpack-file
unpack-file.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o export.o
export.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-export export.o
libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff-cache.o
diff-cache.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-diff-cache
diff-cache.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o convert-cache.o
convert-cache.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-convert-cache
convert-cache.o libgit.a -lz -lcrypto
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o pull.o pull.c
cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o http-pull.o
http-pull.c
http-pull.c:6: curl/curl.h: No such file or directory
http-pull.c:7: curl/easy.h: No such file or directory
gmake: *** [http-pull.o] Error 1
rm cat-file.o diff-files.o rev-tree.o fsck-cache.o convert-cache.o
unpack-file.o diff-cache.o checkout-cache.o update-cache.o diff-tree.o
export.o read-tree.o write-tree.o merge-base.o ls-tree.o check-files.o
commit-tree.o merge-cache.o ls-files.o init-db.o
[emlis:~/src/cogito-0.12.1]$ which curl
/usr/local/bin/curl
[emlis:~/src/cogito-0.12.1]$ locate libcurl
/usr/local/lib/comprex/scheme/libcurlscm.a
/usr/local/lib/comprex/scheme/libcurlscm.la
/usr/local/lib/comprex/scheme/libcurlscm.so
/usr/local/lib/libcurl.a
/usr/local/lib/libcurl.la
/usr/local/lib/libcurl.so
/usr/local/lib/libcurl.so.2
/usr/local/man/man3/libcurl-errors.3
/usr/local/man/man3/libcurl-multi.3
/usr/local/man/man3/libcurl.3
/usr/local/share/doc/curl/libcurl
/usr/local/share/doc/curl/libcurl/Makefile
/usr/local/share/doc/curl/libcurl/Makefile.am
/usr/local/share/doc/curl/libcurl/Makefile.in
/usr/local/share/doc/curl/libcurl/curl_easy_cleanup.3
/usr/local/share/doc/curl/libcurl/curl_easy_cleanup.html
/usr/local/share/doc/curl/libcurl/curl_easy_cleanup.pdf
/usr/local/share/doc/curl/libcurl/curl_easy_duphandle.3
/usr/local/share/doc/curl/libcurl/curl_easy_duphandle.html
/usr/local/share/doc/curl/libcurl/curl_easy_duphandle.pdf
/usr/local/share/doc/curl/libcurl/curl_easy_getinfo.3
/usr/local/share/doc/curl/libcurl/curl_easy_getinfo.html
/usr/local/share/doc/curl/libcurl/curl_easy_getinfo.pdf
/usr/local/share/doc/curl/libcurl/curl_easy_init.3
/usr/local/share/doc/curl/libcurl/curl_easy_init.html
/usr/local/share/doc/curl/libcurl/curl_easy_init.pdf
/usr/local/share/doc/curl/libcurl/curl_easy_perform.3
/usr/local/share/doc/curl/libcurl/curl_easy_perform.html
/usr/local/share/doc/curl/libcurl/curl_easy_perform.pdf
/usr/local/share/doc/curl/libcurl/curl_easy_setopt.3
/usr/local/share/doc/curl/libcurl/curl_easy_setopt.html
/usr/local/share/doc/curl/libcurl/curl_easy_setopt.pdf
/usr/local/share/doc/curl/libcurl/curl_escape.3
/usr/local/share/doc/curl/libcurl/curl_escape.html
/usr/local/share/doc/curl/libcurl/curl_escape.pdf
/usr/local/share/doc/curl/libcurl/curl_formadd.3
/usr/local/share/doc/curl/libcurl/curl_formadd.html
/usr/local/share/doc/curl/libcurl/curl_formadd.pdf
/usr/local/share/doc/curl/libcurl/curl_formfree.3
/usr/local/share/doc/curl/libcurl/curl_formfree.html
/usr/local/share/doc/curl/libcurl/curl_formfree.pdf
/usr/local/share/doc/curl/libcurl/curl_formparse.3
/usr/local/share/doc/curl/libcurl/curl_formparse.html
/usr/local/share/doc/curl/libcurl/curl_formparse.pdf
/usr/local/share/doc/curl/libcurl/curl_free.3
/usr/local/share/doc/curl/libcurl/curl_free.html
/usr/local/share/doc/curl/libcurl/curl_free.pdf
/usr/local/share/doc/curl/libcurl/curl_getdate.3
/usr/local/share/doc/curl/libcurl/curl_getdate.html
/usr/local/share/doc/curl/libcurl/curl_getdate.pdf
/usr/local/share/doc/curl/libcurl/curl_getenv.3
/usr/local/share/doc/curl/libcurl/curl_getenv.html
/usr/local/share/doc/curl/libcurl/curl_getenv.pdf
/usr/local/share/doc/curl/libcurl/curl_global_cleanup.3
/usr/local/share/doc/curl/libcurl/curl_global_cleanup.html
/usr/local/share/doc/curl/libcurl/curl_global_cleanup.pdf
/usr/local/share/doc/curl/libcurl/curl_global_init.3
/usr/local/share/doc/curl/libcurl/curl_global_init.html
/usr/local/share/doc/curl/libcurl/curl_global_init.pdf
/usr/local/share/doc/curl/libcurl/curl_mprintf.3
/usr/local/share/doc/curl/libcurl/curl_mprintf.html
/usr/local/share/doc/curl/libcurl/curl_mprintf.pdf
/usr/local/share/doc/curl/libcurl/curl_multi_add_handle.3
/usr/local/share/doc/curl/libcurl/curl_multi_add_handle.html
/usr/local/share/doc/curl/libcurl/curl_multi_add_handle.pdf
/usr/local/share/doc/curl/libcurl/curl_multi_cleanup.3
/usr/local/share/doc/curl/libcurl/curl_multi_cleanup.html
/usr/local/share/doc/curl/libcurl/curl_multi_cleanup.pdf
/usr/local/share/doc/curl/libcurl/curl_multi_fdset.3
/usr/local/share/doc/curl/libcurl/curl_multi_fdset.html
/usr/local/share/doc/curl/libcurl/curl_multi_fdset.pdf
/usr/local/share/doc/curl/libcurl/curl_multi_info_read.3
/usr/local/share/doc/curl/libcurl/curl_multi_info_read.html
/usr/local/share/doc/curl/libcurl/curl_multi_info_read.pdf
/usr/local/share/doc/curl/libcurl/curl_multi_init.3
/usr/local/share/doc/curl/libcurl/curl_multi_init.html
/usr/local/share/doc/curl/libcurl/curl_multi_init.pdf
/usr/local/share/doc/curl/libcurl/curl_multi_perform.3
/usr/local/share/doc/curl/libcurl/curl_multi_perform.html
/usr/local/share/doc/curl/libcurl/curl_multi_perform.pdf
/usr/local/share/doc/curl/libcurl/curl_multi_remove_handle.3
/usr/local/share/doc/curl/libcurl/curl_multi_remove_handle.html
/usr/local/share/doc/curl/libcurl/curl_multi_remove_handle.pdf
/usr/local/share/doc/curl/libcurl/curl_slist_append.3
/usr/local/share/doc/curl/libcurl/curl_slist_append.html
/usr/local/share/doc/curl/libcurl/curl_slist_append.pdf
/usr/local/share/doc/curl/libcurl/curl_slist_free_all.3
/usr/local/share/doc/curl/libcurl/curl_slist_free_all.html
/usr/local/share/doc/curl/libcurl/curl_slist_free_all.pdf
/usr/local/share/doc/curl/libcurl/curl_strequal.3
/usr/local/share/doc/curl/libcurl/curl_strequal.html
/usr/local/share/doc/curl/libcurl/curl_strequal.pdf
/usr/local/share/doc/curl/libcurl/curl_strnequal.3
/usr/local/share/doc/curl/libcurl/curl_strnequal.html
/usr/local/share/doc/curl/libcurl/curl_strnequal.pdf
/usr/local/share/doc/curl/libcurl/curl_unescape.3
/usr/local/share/doc/curl/libcurl/curl_unescape.html
/usr/local/share/doc/curl/libcurl/curl_unescape.pdf
/usr/local/share/doc/curl/libcurl/curl_version.3
/usr/local/share/doc/curl/libcurl/curl_version.html
/usr/local/share/doc/curl/libcurl/curl_version.pdf
/usr/local/share/doc/curl/libcurl/curl_version_info.3
/usr/local/share/doc/curl/libcurl/curl_version_info.html
/usr/local/share/doc/curl/libcurl/curl_version_info.pdf
/usr/local/share/doc/curl/libcurl/index.html
/usr/local/share/doc/curl/libcurl/libcurl-errors.3
/usr/local/share/doc/curl/libcurl/libcurl-errors.html
/usr/local/share/doc/curl/libcurl/libcurl-errors.pdf
/usr/local/share/doc/curl/libcurl/libcurl-multi.3
/usr/local/share/doc/curl/libcurl/libcurl-multi.html
/usr/local/share/doc/curl/libcurl/libcurl-multi.pdf
/usr/local/share/doc/curl/libcurl/libcurl.3
/usr/local/share/doc/curl/libcurl/libcurl.html
/usr/local/share/doc/curl/libcurl/libcurl.pdf
/usr/local/share/doc/curl/libcurl-the-guide
[emlis:~/src/cogito-0.12.1]$ curl-config --version
libcurl 7.10.5
- dan
--
Dan Kohn <mailto:dan@dankohn.com>
<http://www.dankohn.com/> <tel:+1-650-327-2600>
^ permalink raw reply
* Re: Compilation troubles
From: Marc Singer @ 2005-07-12 18:36 UTC (permalink / raw)
To: Dan Kohn; +Cc: git
In-Reply-To: <B1091462CF5479489B1D8FE818330D2C01371D9F@exchange2003.ad.skymv.com>
On Tue, Jul 12, 2005 at 11:33:36AM -0700, Dan Kohn wrote:
> I apologize for what are probably obvious compilation questions, but I
> suspect other newbies are encountering them as well. I'm having trouble
> installing cogito 0.12.1 on both a vanilla Ubuntu box and on my account
> on a FreeBSD machine. I'm used to autoconf-built programs, so there's
> probably just some simple library path I'm not setting up right. But
> I'd appreciate your suggestions, and perhaps we can add the answer to
> the INSTALL file.
>
> UBUNTU 5.04
>
> I used synaptics to install openssl, zlib, and curl, but cogito can't
> seem to see them.
Perhaps you need the openssl-dev and zlib-dev packages. Just a guess
since I don't know ubuntu.
>
> root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 # make
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o read-cache.o
> read-cache.c
> In file included from read-cache.c:6:
> cache.h:21:21: openssl/sha.h: No such file or directory
> cache.h:22:18: zlib.h: No such file or directory
> In file included from read-cache.c:6:
> cache.h:169: error: syntax error before '*' token
> read-cache.c: In function `verify_hdr':
> read-cache.c:339: error: `SHA_CTX' undeclared (first use in this
> function)
> read-cache.c:339: error: (Each undeclared identifier is reported only
> once
> read-cache.c:339: error: for each function it appears in.)
> read-cache.c:339: error: syntax error before "c"
> read-cache.c:346: warning: implicit declaration of function `SHA1_Init'
> read-cache.c:346: error: `c' undeclared (first use in this function)
> read-cache.c:347: warning: implicit declaration of function
> `SHA1_Update'
> read-cache.c:348: warning: implicit declaration of function `SHA1_Final'
> read-cache.c: At top level:
> read-cache.c:408: error: syntax error before '*' token
> read-cache.c: In function `ce_write':
> read-cache.c:410: error: `len' undeclared (first use in this function)
> read-cache.c:415: error: `data' undeclared (first use in this function)
> read-cache.c:418: error: `context' undeclared (first use in this
> function)
> read-cache.c:419: error: `fd' undeclared (first use in this function)
> read-cache.c: At top level:
> read-cache.c:430: error: syntax error before '*' token
> read-cache.c: In function `ce_flush':
> read-cache.c:436: error: `context' undeclared (first use in this
> function)
> read-cache.c:442: error: `fd' undeclared (first use in this function)
> read-cache.c: In function `write_cache':
> read-cache.c:449: error: `SHA_CTX' undeclared (first use in this
> function)
> read-cache.c:449: error: syntax error before "c"
> read-cache.c:461: error: `c' undeclared (first use in this function)
> make: *** [read-cache.o] Error 1
> root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 # locate openssl
> /etc/ssl/openssl.cnf
> [long list of python and docs elided]
> /usr/share/man/man1/openssl.1ssl.gz
> /usr/bin/openssl
> /usr/bin/openssl_fips_fingerprint
> /usr/lib/libgnutls-openssl.so.11.1.16
> /usr/lib/libgnutls-openssl.so.11
> /usr/lib/ssl/openssl.cnf
> /usr/local/ssl/man/man1/openssl.1
> /usr/local/ssl/bin/openssl
> /usr/local/ssl/lib/pkgconfig/openssl.pc
> /usr/local/ssl/include/openssl
> /usr/local/ssl/include/openssl/e_os2.h
> /usr/local/ssl/include/openssl/crypto.h
> /usr/local/ssl/include/openssl/tmdiff.h
> /usr/local/ssl/include/openssl/opensslv.h
> /usr/local/ssl/include/openssl/opensslconf.h
> /usr/local/ssl/include/openssl/ebcdic.h
> /usr/local/ssl/include/openssl/symhacks.h
> /usr/local/ssl/include/openssl/ossl_typ.h
> /usr/local/ssl/include/openssl/objects.h
> /usr/local/ssl/include/openssl/obj_mac.h
> /usr/local/ssl/include/openssl/md2.h
> /usr/local/ssl/include/openssl/md4.h
> /usr/local/ssl/include/openssl/md5.h
> /usr/local/ssl/include/openssl/sha.h
> /usr/local/ssl/include/openssl/hmac.h
> /usr/local/ssl/include/openssl/ripemd.h
> /usr/local/ssl/include/openssl/des.h
> /usr/local/ssl/include/openssl/des_old.h
> /usr/local/ssl/include/openssl/aes.h
> /usr/local/ssl/include/openssl/rc2.h
> /usr/local/ssl/include/openssl/rc4.h
> /usr/local/ssl/include/openssl/idea.h
> /usr/local/ssl/include/openssl/blowfish.h
> /usr/local/ssl/include/openssl/cast.h
> /usr/local/ssl/include/openssl/bn.h
> /usr/local/ssl/include/openssl/ec.h
> /usr/local/ssl/include/openssl/rsa.h
> /usr/local/ssl/include/openssl/dsa.h
> /usr/local/ssl/include/openssl/ecdsa.h
> /usr/local/ssl/include/openssl/dh.h
> /usr/local/ssl/include/openssl/ecdh.h
> /usr/local/ssl/include/openssl/dso.h
> /usr/local/ssl/include/openssl/engine.h
> /usr/local/ssl/include/openssl/buffer.h
> /usr/local/ssl/include/openssl/bio.h
> /usr/local/ssl/include/openssl/stack.h
> /usr/local/ssl/include/openssl/safestack.h
> /usr/local/ssl/include/openssl/lhash.h
> /usr/local/ssl/include/openssl/rand.h
> /usr/local/ssl/include/openssl/err.h
> /usr/local/ssl/include/openssl/evp.h
> /usr/local/ssl/include/openssl/asn1.h
> /usr/local/ssl/include/openssl/asn1_mac.h
> /usr/local/ssl/include/openssl/asn1t.h
> /usr/local/ssl/include/openssl/pem.h
> /usr/local/ssl/include/openssl/pem2.h
> /usr/local/ssl/include/openssl/x509.h
> /usr/local/ssl/include/openssl/x509_vfy.h
> /usr/local/ssl/include/openssl/x509v3.h
> /usr/local/ssl/include/openssl/conf.h
> /usr/local/ssl/include/openssl/conf_api.h
> /usr/local/ssl/include/openssl/txt_db.h
> /usr/local/ssl/include/openssl/pkcs7.h
> /usr/local/ssl/include/openssl/pkcs12.h
> /usr/local/ssl/include/openssl/comp.h
> /usr/local/ssl/include/openssl/ocsp.h
> /usr/local/ssl/include/openssl/ui.h
> /usr/local/ssl/include/openssl/ui_compat.h
> /usr/local/ssl/include/openssl/krb5_asn.h
> /usr/local/ssl/include/openssl/store.h
> /usr/local/ssl/include/openssl/pqueue.h
> /usr/local/ssl/include/openssl/pq_compat.h
> /usr/local/ssl/include/openssl/ssl.h
> /usr/local/ssl/include/openssl/ssl2.h
> /usr/local/ssl/include/openssl/ssl3.h
> /usr/local/ssl/include/openssl/ssl23.h
> /usr/local/ssl/include/openssl/tls1.h
> /usr/local/ssl/include/openssl/dtls1.h
> /usr/local/ssl/include/openssl/kssl.h
> /usr/local/ssl/openssl.cnf
> root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 # locate zlib
> 1.9.79/program/python-core-2.3.4/lib/encodings/zlib_codec.py
> 1.9.79/program/python-core-2.3.4/lib/test/test_zlib.py
> /media/windows/Program Files/Trillian/zlib1.dll
> /var/lib/dpkg/info/zlib1g.postinst
> /var/lib/dpkg/info/zlib1g.list
> /var/lib/dpkg/info/zlib1g.preinst
> /var/lib/dpkg/info/zlib1g.shlibs
> /var/lib/dpkg/info/zlib1g.md5sums
> /var/cache/apt/archives/zlib1g_1%3a1.2.2-4ubuntu1.1_i386.deb
> /usr/share/doc/zlib1g
> /usr/share/doc/zlib1g/changelog.gz
> /usr/share/doc/zlib1g/README.gz
> /usr/share/doc/zlib1g/README.Debian
> /usr/share/doc/zlib1g/copyright
> /usr/share/doc/zlib1g/changelog.Debian.gz
> /usr/share/doc/python2.4/examples/Demo/zlib
> /usr/share/doc/python2.4/examples/Demo/zlib/minigzip.py
> /usr/share/doc/python2.4/examples/Demo/zlib/zlibdemo.py
> /usr/include/linux/zlib.h
> /usr/lib/python2.4/lib-dynload/zlib.so
> /usr/lib/python2.4/encodings/zlib_codec.py
> /usr/lib/python2.4/encodings/zlib_codec.pyc
> /usr/lib/python2.4/encodings/zlib_codec.pyo
> /usr/lib/win32/avizlib.dll
> /lib/modules/2.6.10-5-386/kernel/lib/zlib_deflate
> /lib/modules/2.6.10-5-386/kernel/lib/zlib_deflate/zlib_deflate.ko
> root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 #
>
>
>
>
> FREEBSD
>
> I believe I need to modify the Makefile to find my libcurl, but I don't
> know how. Also, it's probably worth mentioning in INSTALL that gmake is
> necessary, for those machines that have both.
>
> [emlis:~/src/cogito-0.12.1]$ make
> "Makefile", line 109: Need an operator
> "Makefile", line 112: Need an operator
> "Makefile", line 115: Need an operator
> "Makefile", line 116: Need an operator
> "Makefile", line 119: Need an operator
> "Makefile", line 120: Need an operator
> "Makefile", line 123: Need an operator
> "Makefile", line 126: Need an operator
> "Makefile", line 127: Need an operator
> "Makefile", line 162: Missing dependency operator
> "Makefile", line 165: Need an operator
> make: fatal errors encountered -- cannot continue
> [emlis:~/src/cogito-0.12.1]$ gmake
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o read-cache.o
> read-cache.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o sha1_file.o
> sha1_file.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o usage.o usage.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o object.o
> object.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o commit.o
> commit.c
> commit.c: In function `add_user_info':
> commit.c:244: warning: field width is not type int (arg 4)
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o tree.o tree.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o blob.o blob.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o tag.o tag.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o date.o date.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o index.o index.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff-delta.o
> diff-delta.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o patch-delta.o
> patch-delta.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o entry.o entry.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o path.o path.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o epoch.o epoch.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o refs.o refs.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o csum-file.o
> csum-file.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o pack-check.o
> pack-check.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o pkt-line.o
> pkt-line.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o connect.o
> connect.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o strbuf.o
> strbuf.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o quote.o quote.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff.o diff.c
> diff.c: In function `parse_num':
> diff.c:702: warning: value computed is not used
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
> diffcore-rename.o diffcore-rename.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
> diffcore-pickaxe.o diffcore-pickaxe.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
> diffcore-pathspec.o diffcore-pathspec.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
> diffcore-break.o diffcore-break.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
> diffcore-order.o diffcore-order.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o count-delta.o
> count-delta.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o gitenv.o
> gitenv.c
> ar rcs libgit.a read-cache.o sha1_file.o usage.o object.o commit.o
> tree.o blob.o tag.o date.o index.o diff-delta.o patch-delta.o entry.o
> path.o epoch.o refs.o csum-file.o pack-check.o pkt-line.o connect.o
> strbuf.o quote.o diff.o diffcore-rename.o diffcore-pickaxe.o
> diffcore-pathspec.o diffcore-break.o diffcore-order.o count-delta.o
> gitenv.o epoch.o
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o update-cache.o
> update-cache.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-update-cache
> update-cache.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff-files.o
> diff-files.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-diff-files
> diff-files.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o init-db.o
> init-db.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-init-db
> init-db.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o write-tree.o
> write-tree.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-write-tree
> write-tree.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o read-tree.o
> read-tree.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-read-tree
> read-tree.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o commit-tree.o
> commit-tree.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-commit-tree
> commit-tree.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o cat-file.o
> cat-file.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-cat-file
> cat-file.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o fsck-cache.o
> fsck-cache.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-fsck-cache
> fsck-cache.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
> checkout-cache.o checkout-cache.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-checkout-cache
> checkout-cache.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff-tree.o
> diff-tree.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-diff-tree
> diff-tree.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o rev-tree.o
> rev-tree.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-rev-tree
> rev-tree.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o ls-files.o
> ls-files.c
> ls-files.c: In function `show_files':
> ls-files.c:270: warning: unsigned int format, u_long arg (arg 3)
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-ls-files
> ls-files.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o check-files.o
> check-files.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-check-files
> check-files.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o ls-tree.o
> ls-tree.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-ls-tree
> ls-tree.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o merge-base.o
> merge-base.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-merge-base
> merge-base.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o merge-cache.o
> merge-cache.c
> merge-cache.c: In function `merge_entry':
> merge-cache.c:62: warning: unsigned int format, long unsigned int arg
> (arg 3)
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-merge-cache
> merge-cache.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o unpack-file.o
> unpack-file.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-unpack-file
> unpack-file.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o export.o
> export.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-export export.o
> libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o diff-cache.o
> diff-cache.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-diff-cache
> diff-cache.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o convert-cache.o
> convert-cache.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -o git-convert-cache
> convert-cache.o libgit.a -lz -lcrypto
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o pull.o pull.c
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o http-pull.o
> http-pull.c
> http-pull.c:6: curl/curl.h: No such file or directory
> http-pull.c:7: curl/easy.h: No such file or directory
> gmake: *** [http-pull.o] Error 1
> rm cat-file.o diff-files.o rev-tree.o fsck-cache.o convert-cache.o
> unpack-file.o diff-cache.o checkout-cache.o update-cache.o diff-tree.o
> export.o read-tree.o write-tree.o merge-base.o ls-tree.o check-files.o
> commit-tree.o merge-cache.o ls-files.o init-db.o
> [emlis:~/src/cogito-0.12.1]$ which curl
> /usr/local/bin/curl
> [emlis:~/src/cogito-0.12.1]$ locate libcurl
> /usr/local/lib/comprex/scheme/libcurlscm.a
> /usr/local/lib/comprex/scheme/libcurlscm.la
> /usr/local/lib/comprex/scheme/libcurlscm.so
> /usr/local/lib/libcurl.a
> /usr/local/lib/libcurl.la
> /usr/local/lib/libcurl.so
> /usr/local/lib/libcurl.so.2
> /usr/local/man/man3/libcurl-errors.3
> /usr/local/man/man3/libcurl-multi.3
> /usr/local/man/man3/libcurl.3
> /usr/local/share/doc/curl/libcurl
> /usr/local/share/doc/curl/libcurl/Makefile
> /usr/local/share/doc/curl/libcurl/Makefile.am
> /usr/local/share/doc/curl/libcurl/Makefile.in
> /usr/local/share/doc/curl/libcurl/curl_easy_cleanup.3
> /usr/local/share/doc/curl/libcurl/curl_easy_cleanup.html
> /usr/local/share/doc/curl/libcurl/curl_easy_cleanup.pdf
> /usr/local/share/doc/curl/libcurl/curl_easy_duphandle.3
> /usr/local/share/doc/curl/libcurl/curl_easy_duphandle.html
> /usr/local/share/doc/curl/libcurl/curl_easy_duphandle.pdf
> /usr/local/share/doc/curl/libcurl/curl_easy_getinfo.3
> /usr/local/share/doc/curl/libcurl/curl_easy_getinfo.html
> /usr/local/share/doc/curl/libcurl/curl_easy_getinfo.pdf
> /usr/local/share/doc/curl/libcurl/curl_easy_init.3
> /usr/local/share/doc/curl/libcurl/curl_easy_init.html
> /usr/local/share/doc/curl/libcurl/curl_easy_init.pdf
> /usr/local/share/doc/curl/libcurl/curl_easy_perform.3
> /usr/local/share/doc/curl/libcurl/curl_easy_perform.html
> /usr/local/share/doc/curl/libcurl/curl_easy_perform.pdf
> /usr/local/share/doc/curl/libcurl/curl_easy_setopt.3
> /usr/local/share/doc/curl/libcurl/curl_easy_setopt.html
> /usr/local/share/doc/curl/libcurl/curl_easy_setopt.pdf
> /usr/local/share/doc/curl/libcurl/curl_escape.3
> /usr/local/share/doc/curl/libcurl/curl_escape.html
> /usr/local/share/doc/curl/libcurl/curl_escape.pdf
> /usr/local/share/doc/curl/libcurl/curl_formadd.3
> /usr/local/share/doc/curl/libcurl/curl_formadd.html
> /usr/local/share/doc/curl/libcurl/curl_formadd.pdf
> /usr/local/share/doc/curl/libcurl/curl_formfree.3
> /usr/local/share/doc/curl/libcurl/curl_formfree.html
> /usr/local/share/doc/curl/libcurl/curl_formfree.pdf
> /usr/local/share/doc/curl/libcurl/curl_formparse.3
> /usr/local/share/doc/curl/libcurl/curl_formparse.html
> /usr/local/share/doc/curl/libcurl/curl_formparse.pdf
> /usr/local/share/doc/curl/libcurl/curl_free.3
> /usr/local/share/doc/curl/libcurl/curl_free.html
> /usr/local/share/doc/curl/libcurl/curl_free.pdf
> /usr/local/share/doc/curl/libcurl/curl_getdate.3
> /usr/local/share/doc/curl/libcurl/curl_getdate.html
> /usr/local/share/doc/curl/libcurl/curl_getdate.pdf
> /usr/local/share/doc/curl/libcurl/curl_getenv.3
> /usr/local/share/doc/curl/libcurl/curl_getenv.html
> /usr/local/share/doc/curl/libcurl/curl_getenv.pdf
> /usr/local/share/doc/curl/libcurl/curl_global_cleanup.3
> /usr/local/share/doc/curl/libcurl/curl_global_cleanup.html
> /usr/local/share/doc/curl/libcurl/curl_global_cleanup.pdf
> /usr/local/share/doc/curl/libcurl/curl_global_init.3
> /usr/local/share/doc/curl/libcurl/curl_global_init.html
> /usr/local/share/doc/curl/libcurl/curl_global_init.pdf
> /usr/local/share/doc/curl/libcurl/curl_mprintf.3
> /usr/local/share/doc/curl/libcurl/curl_mprintf.html
> /usr/local/share/doc/curl/libcurl/curl_mprintf.pdf
> /usr/local/share/doc/curl/libcurl/curl_multi_add_handle.3
> /usr/local/share/doc/curl/libcurl/curl_multi_add_handle.html
> /usr/local/share/doc/curl/libcurl/curl_multi_add_handle.pdf
> /usr/local/share/doc/curl/libcurl/curl_multi_cleanup.3
> /usr/local/share/doc/curl/libcurl/curl_multi_cleanup.html
> /usr/local/share/doc/curl/libcurl/curl_multi_cleanup.pdf
> /usr/local/share/doc/curl/libcurl/curl_multi_fdset.3
> /usr/local/share/doc/curl/libcurl/curl_multi_fdset.html
> /usr/local/share/doc/curl/libcurl/curl_multi_fdset.pdf
> /usr/local/share/doc/curl/libcurl/curl_multi_info_read.3
> /usr/local/share/doc/curl/libcurl/curl_multi_info_read.html
> /usr/local/share/doc/curl/libcurl/curl_multi_info_read.pdf
> /usr/local/share/doc/curl/libcurl/curl_multi_init.3
> /usr/local/share/doc/curl/libcurl/curl_multi_init.html
> /usr/local/share/doc/curl/libcurl/curl_multi_init.pdf
> /usr/local/share/doc/curl/libcurl/curl_multi_perform.3
> /usr/local/share/doc/curl/libcurl/curl_multi_perform.html
> /usr/local/share/doc/curl/libcurl/curl_multi_perform.pdf
> /usr/local/share/doc/curl/libcurl/curl_multi_remove_handle.3
> /usr/local/share/doc/curl/libcurl/curl_multi_remove_handle.html
> /usr/local/share/doc/curl/libcurl/curl_multi_remove_handle.pdf
> /usr/local/share/doc/curl/libcurl/curl_slist_append.3
> /usr/local/share/doc/curl/libcurl/curl_slist_append.html
> /usr/local/share/doc/curl/libcurl/curl_slist_append.pdf
> /usr/local/share/doc/curl/libcurl/curl_slist_free_all.3
> /usr/local/share/doc/curl/libcurl/curl_slist_free_all.html
> /usr/local/share/doc/curl/libcurl/curl_slist_free_all.pdf
> /usr/local/share/doc/curl/libcurl/curl_strequal.3
> /usr/local/share/doc/curl/libcurl/curl_strequal.html
> /usr/local/share/doc/curl/libcurl/curl_strequal.pdf
> /usr/local/share/doc/curl/libcurl/curl_strnequal.3
> /usr/local/share/doc/curl/libcurl/curl_strnequal.html
> /usr/local/share/doc/curl/libcurl/curl_strnequal.pdf
> /usr/local/share/doc/curl/libcurl/curl_unescape.3
> /usr/local/share/doc/curl/libcurl/curl_unescape.html
> /usr/local/share/doc/curl/libcurl/curl_unescape.pdf
> /usr/local/share/doc/curl/libcurl/curl_version.3
> /usr/local/share/doc/curl/libcurl/curl_version.html
> /usr/local/share/doc/curl/libcurl/curl_version.pdf
> /usr/local/share/doc/curl/libcurl/curl_version_info.3
> /usr/local/share/doc/curl/libcurl/curl_version_info.html
> /usr/local/share/doc/curl/libcurl/curl_version_info.pdf
> /usr/local/share/doc/curl/libcurl/index.html
> /usr/local/share/doc/curl/libcurl/libcurl-errors.3
> /usr/local/share/doc/curl/libcurl/libcurl-errors.html
> /usr/local/share/doc/curl/libcurl/libcurl-errors.pdf
> /usr/local/share/doc/curl/libcurl/libcurl-multi.3
> /usr/local/share/doc/curl/libcurl/libcurl-multi.html
> /usr/local/share/doc/curl/libcurl/libcurl-multi.pdf
> /usr/local/share/doc/curl/libcurl/libcurl.3
> /usr/local/share/doc/curl/libcurl/libcurl.html
> /usr/local/share/doc/curl/libcurl/libcurl.pdf
> /usr/local/share/doc/curl/libcurl-the-guide
> [emlis:~/src/cogito-0.12.1]$ curl-config --version
> libcurl 7.10.5
>
> - dan
> --
> Dan Kohn <mailto:dan@dankohn.com>
> <http://www.dankohn.com/> <tel:+1-650-327-2600>
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] tagger id
From: Linus Torvalds @ 2005-07-12 18:54 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: Git Mailing List
In-Reply-To: <m18y0c1prv.fsf@ebiederm.dsl.xmission.com>
Eric,
I ended up coding the ident stuff a bit differently, and I didn't do done
the tag/git-id part yet. Can you check out my latest commit (pushed out,
but it will probably take a few minutes to mirror out), and do the final
tag stuff based on that?
Linus
^ permalink raw reply
* [PATCH] git: fix trivial warning from show_rename_copy()
From: Tony Luck @ 2005-07-12 18:54 UTC (permalink / raw)
To: torvalds; +Cc: git
apply.c: In function `show_rename_copy':
apply.c:1147: warning: field precision is not type int (arg 3)
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
diff --git a/apply.c b/apply.c
--- a/apply.c
+++ b/apply.c
@@ -1143,7 +1143,7 @@ static void show_rename_copy(struct patc
*/
if (old != p->old_name)
printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
- old - p->old_name, p->old_name,
+ (int)(old - p->old_name), p->old_name,
old, new, p->score);
else
printf(" %s %s => %s (%d%%)\n", renamecopy,
^ permalink raw reply
* RE: Compilation troubles
From: Jerry Seutter @ 2005-07-12 19:00 UTC (permalink / raw)
To: Dan Kohn, git
> -----Original Message-----
> From: git-owner@vger.kernel.org
> [mailto:git-owner@vger.kernel.org] On Behalf Of Dan Kohn
> Sent: Tuesday, July 12, 2005 12:34 PM
> To: git@vger.kernel.org
> Subject: Compilation troubles
>
> I apologize for what are probably obvious compilation questions, but I
> suspect other newbies are encountering them as well. I'm
> having trouble
> installing cogito 0.12.1 on both a vanilla Ubuntu box and on
> my account
> on a FreeBSD machine. I'm used to autoconf-built programs, so there's
> probably just some simple library path I'm not setting up right. But
> I'd appreciate your suggestions, and perhaps we can add the answer to
> the INSTALL file.
>
> UBUNTU 5.04
>
> I used synaptics to install openssl, zlib, and curl, but cogito can't
> seem to see them.
>
> root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 # make
> cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o read-cache.o
> read-cache.c
> In file included from read-cache.c:6:
> cache.h:21:21: openssl/sha.h: No such file or directory
I tried this last night with Ubuntu (Warty). The openssl package
doesn't include header files so presumably you would need to install
openssl-dev, only that package doesn't seem to exist in Ubuntu-land. I
gave up at this point and installed on a different system.
The README file for cogito/git mentions that there is an ssl library
included in the source which you can use if you don't have openssl. It
doesn't give any directions on how to use it, however. You could try
looking into using that.
Jerry Seutter
^ permalink raw reply
* [RFC PATCH] cogito --- don't overwrite metadata files in place (breaks CoW use)
From: Chris Wedgwood @ 2005-07-12 19:05 UTC (permalink / raw)
To: Git Mailing List; +Cc: Petr Baudis
Sometimes (often actually) I do:
cp -Rl tree1 tree2 # new tree with implied CoW semantics
cd tree2
cg-update # or similar
the latter well frob .git/HEAD or similar by doing echo foo > bar
which obviously breaks the intended CoW semantics.
How would people feel about something like the patch below be? (RFC
purposes only, please eyeball this before blidnly applying anything.
I may have missed spots or goofed, you never know).
diff --git a/cg-Xlib b/cg-Xlib
--- a/cg-Xlib
+++ b/cg-Xlib
@@ -21,6 +21,12 @@ usage() {
die "usage: $USAGE"
}
+echo_to_file() {
+ TMPFILE=`mktemp "$2.tmp-XXXXXXX"`
+ echo "$1" > "$TMPFILE"
+ mv "$TMPFILE" "$2"
+}
+
pager () {
local line
# Invoke pager only if there's any actual output
@@ -101,7 +107,7 @@ tree_timewarp () {
fi
git-read-tree -m "$branch" || die "$branch: bad commit"
- [ "$no_head_update" ] || echo "$branch" > $_git/HEAD
+ [ "$no_head_update" ] || echo_to_file "$branch" $_git/HEAD
# Kill gone files
git-diff-tree -z -r $base $branch | xargs -0 bash -c '
diff --git a/cg-branch-add b/cg-branch-add
--- a/cg-branch-add
+++ b/cg-branch-add
@@ -50,4 +50,4 @@ mkdir -p $_git/branches
[ -s "$_git/branches/$name" ] && die "branch already exists"
[ -s "$_git/refs/heads/$name" ] && echo "warning: I already have head of this branch" >&2
-echo "$location" >$_git/branches/$name
+echo_to_file "$location" $_git/branches/$name
diff --git a/cg-branch-chg b/cg-branch-chg
--- a/cg-branch-chg
+++ b/cg-branch-chg
@@ -14,4 +14,4 @@ location=$2
([ "$name" ] && [ "$location" ]) || usage
[ -s "$_git/branches/$name" ] || die "branch does not exist"
-echo "$location" >$_git/branches/$name
+echo_to_file "$location" $_git/branches/$name
diff --git a/cg-commit b/cg-commit
--- a/cg-commit
+++ b/cg-commit
@@ -331,7 +331,7 @@ fi
if [ "$newhead" ]; then
echo "Committed as $newhead."
- echo $newhead >$_git/HEAD
+ echo_to_file $newhead $_git/HEAD
[ "$merging" ] && rm $_git/merging $_git/merging-sym $_git/merge-base
# Trigger the postcommit hook
diff --git a/cg-init b/cg-init
--- a/cg-init
+++ b/cg-init
@@ -44,7 +44,7 @@ mkdir $_git/branches
touch $_git/refs/heads/master
if [ "$uri" ]; then
- echo "$uri" >$_git/branches/origin
+ echo_to_file "$uri" $_git/branches/origin
cg-pull origin || die "pull failed"
cp $_git/refs/heads/origin $_git/refs/heads/master
diff --git a/cg-seek b/cg-seek
--- a/cg-seek
+++ b/cg-seek
@@ -44,8 +44,8 @@ fi
if [ "$seek_mode" = "away" ]; then
rm $_git/HEAD
- echo "$dstcommit" >$_git/HEAD
- [ -s $_git/blocked ] || echo "seeked from $_git_head" >$_git/blocked
+ echo_to_file "$dstcommit" $_git/HEAD
+ [ -s $_git/blocked ] || echo_to_file "seeked from $_git_head" $_git/blocked
else
rm $_git/HEAD
ln -s "refs/heads/$_git_head" $_git/HEAD
diff --git a/cg-tag b/cg-tag
--- a/cg-tag
+++ b/cg-tag
@@ -79,5 +79,5 @@ SIGEND
rm -rf "$tagdir"
else
- echo "$id" >$_git/refs/tags/$name
+ echo_to_file "$id" $_git/refs/tags/$name
fi
diff --git a/git-branch-script b/git-branch-script
--- a/git-branch-script
+++ b/git-branch-script
@@ -8,4 +8,4 @@ rev=$(git-rev-parse --verify --default H
[ -z "$branchname" ] && die "git branch: I want a branch name"
[ -e "$GIT_DIR/refs/heads/$branchname" ] && die "$branchname already exists"
-echo $rev > "$GIT_DIR/refs/heads/$branchname"
+echo_to_file $rev "$GIT_DIR/refs/heads/$branchname"
diff --git a/git-checkout-script b/git-checkout-script
--- a/git-checkout-script
+++ b/git-checkout-script
@@ -67,7 +67,7 @@ fi
#
if [ "$?" -eq 0 ]; then
if [ "$newbranch" ]; then
- echo $new > "$GIT_DIR/refs/heads/$newbranch"
+ echo_to_file $new "$GIT_DIR/refs/heads/$newbranch"
branch="$newbranch"
fi
[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
diff --git a/git-commit-script b/git-commit-script
--- a/git-commit-script
+++ b/git-commit-script
@@ -97,7 +97,7 @@ grep -v '^#' < .editmsg | git-stripspace
[ -s .cmitmsg ] &&
tree=$(git-write-tree) &&
commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) &&
- echo $commit > "$GIT_DIR/HEAD" &&
+ echo_to_file $commit "$GIT_DIR/HEAD" &&
rm -f -- "$GIT_DIR/MERGE_HEAD"
ret="$?"
rm -f .cmitmsg .editmsg
diff --git a/git-fetch-script b/git-fetch-script
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -30,4 +30,4 @@ rsync://*)
;;
esac || exit 1
git-rev-parse --verify "$head" > /dev/null || exit 1
-echo "$head" > "$GIT_DIR/$destination"
+echo_to_file "$head" "$GIT_DIR/$destination"
diff --git a/git-rebase-script b/git-rebase-script
--- a/git-rebase-script
+++ b/git-rebase-script
@@ -21,7 +21,7 @@ case "$#" in
esac
git-read-tree -m -u $junio $linus &&
-echo "$linus" >"$GIT_DIR/HEAD" || exit
+echo_to_file "$linus" "$GIT_DIR/HEAD" || exit
tmp=.rebase-tmp$$
fail=$tmp-fail
diff --git a/git-resolve-script b/git-resolve-script
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -24,8 +24,8 @@ if [ -z "$head" -o -z "$merge" -o -z "$m
fi
dropheads
-echo $head > "$GIT_DIR"/ORIG_HEAD
-echo $merge > "$GIT_DIR"/LAST_MERGE
+echo_to_file $head "$GIT_DIR"/ORIG_HEAD
+echo_to_file $merge "$GIT_DIR"/LAST_MERGE
common=$(git-merge-base $head $merge)
if [ -z "$common" ]; then
@@ -40,7 +40,7 @@ fi
if [ "$common" == "$head" ]; then
echo "Updating from $head to $merge."
git-read-tree -u -m $head $merge || exit 1
- echo $merge > "$GIT_DIR"/HEAD
+ echo_to_file $merge "$GIT_DIR"/HEAD
git-diff-tree -p $head $merge | git-apply --stat
dropheads
exit 0
@@ -52,13 +52,13 @@ if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge"
git-merge-cache -o git-merge-one-file-script -a
if [ $? -ne 0 ]; then
- echo $merge > "$GIT_DIR"/MERGE_HEAD
+ echo_to_file $merge "$GIT_DIR"/MERGE_HEAD
die "Automatic merge failed, fix up by hand"
fi
result_tree=$(git-write-tree) || exit 1
fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
echo "Committed merge $result_commit"
-echo $result_commit > "$GIT_DIR"/HEAD
+echo_to_file $result_commit "$GIT_DIR"/HEAD
git-diff-tree -p $head $result_commit | git-apply --stat
dropheads
^ permalink raw reply
* RE: Compilation troubles
From: Jerry Seutter @ 2005-07-12 19:47 UTC (permalink / raw)
To: Jerry Seutter, Dan Kohn, git
> -----Original Message-----
> From: git-owner@vger.kernel.org
> [mailto:git-owner@vger.kernel.org] On Behalf Of Jerry Seutter
> Sent: Tuesday, July 12, 2005 1:01 PM
> To: Dan Kohn; git@vger.kernel.org
> Subject: RE: Compilation troubles
>
>
>
> > -----Original Message-----
> > From: git-owner@vger.kernel.org
> > [mailto:git-owner@vger.kernel.org] On Behalf Of Dan Kohn
> > Sent: Tuesday, July 12, 2005 12:34 PM
> > To: git@vger.kernel.org
> > Subject: Compilation troubles
> >
> > I apologize for what are probably obvious compilation
> questions, but I
> > suspect other newbies are encountering them as well. I'm
> > having trouble
> > installing cogito 0.12.1 on both a vanilla Ubuntu box and on
> > my account
> > on a FreeBSD machine. I'm used to autoconf-built programs,
> so there's
> > probably just some simple library path I'm not setting up
> right. But
> > I'd appreciate your suggestions, and perhaps we can add the
> answer to
> > the INSTALL file.
> >
> > UBUNTU 5.04
> >
> > I used synaptics to install openssl, zlib, and curl, but
> cogito can't
> > seem to see them.
> >
> > root@ubuntu-dan-kohn:/usr/local/src/cogito-0.12.1 # make
> > cc -g -O2 -Wall '-DSHA1_HEADER=<openssl/sha.h>' -c -o
> read-cache.o
> > read-cache.c
> > In file included from read-cache.c:6:
> > cache.h:21:21: openssl/sha.h: No such file or directory
>
> I tried this last night with Ubuntu (Warty). The openssl package
> doesn't include header files so presumably you would need to install
> openssl-dev, only that package doesn't seem to exist in
> Ubuntu-land. I
> gave up at this point and installed on a different system.
>
> The README file for cogito/git mentions that there is an ssl library
> included in the source which you can use if you don't have
> openssl. It
> doesn't give any directions on how to use it, however. You could try
> looking into using that.
>
If you build the openssl package from source, it builds a libssl-dev
package that you can install on your system. Do something like:
mkdir -p /tmp/tmp && cd /tmp/tmp
apt-get source openssl
sudo ./openssl-0.9.7d/debian/rules binary
sudo dpkg -i libssl-dev_0.9.7d-3ubuntu0.1_i386.deb
then you should be able to build past the openssl part. Presumably
you'll have to do something similar for libcurl, but I haven't tried it.
Jerry Seutter
^ permalink raw reply
* RE: Compilation troubles
From: Linus Torvalds @ 2005-07-12 20:27 UTC (permalink / raw)
To: Jerry Seutter; +Cc: Dan Kohn, git
In-Reply-To: <5EDB10423795F248B2A4C4957409ED680280D603@exch-calgary.int.pason.com>
On Tue, 12 Jul 2005, Jerry Seutter wrote:
>
> The README file for cogito/git mentions that there is an ssl library
> included in the source which you can use if you don't have openssl. It
> doesn't give any directions on how to use it, however. You could try
> looking into using that.
Use
make MOZILLA_SHA1=1
to use the included mozilla-based SHA1 library.
(Or just do "export MOZILLA_SHA1=1" in your .bashrc so that you always do
this).
There's also a "PPC_SHA1" which works the same way, and which enables the
optimized ppc assembly language version. It used to make a big difference
for me, but it seems modern openssl libraries already have something
fairly optimized (on my YDL machine the openssl version was really slow).
Linus
^ permalink raw reply
* Re: [PATCH] tagger id
From: Junio C Hamano @ 2005-07-12 21:16 UTC (permalink / raw)
To: git
In-Reply-To: <m14qb012x4.fsf@ebiederm.dsl.xmission.com>
Eric W. Biederman <ebiederm <at> xmission.com> writes:
>
> Junio C Hamano <junkio <at> cox.net> writes:
>
> > The only in-tree user after your patch is applied is the tagger
> > stuff, so in that sense committer_ident may make more sense.
>
> There is also the commit path, and that comes from C. I'm not
> quite certain how we should be using the environmental variables.
But there you would not have "default" issue, would you?
> 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 date is a human unreadable string of the number of seconds
> since the epoch (aka 1 Jan 1970 UTC).
This may sound whacy, but how about having git-env command that
(1) parrots GIT_* environment variables if the user has one; or
(2) shows the values of environment variables the user _could_ have had
to cause the program to behave the same way, when it the user does
not have them?
Synopsis.
$ git-env [--values-only] [<variable name>...]
Examples.
$ git-env GIT_COMMITER_DATE GIT_AUTHOR_NAME
GIT_COMMITTER_DATE='1121202267 -0700'
GIT_AUTHOR_NAME='Junio C Hamano'
$ unset GIT_OBJECT_DIRECTORY
$ GIT_DIR=foo git-env --values-only GIT_OBJECT_DIRECTORY
foo/objects
$ git-env
GIT_DIR=.git
GIT_OBJECT_DIRECTORY=.git/objects
...
$ eval "`git-env GIT_COMMITTER_DATE GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE`"
$ tagger="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE"
We could add a couple of "variable name"s that we do _not_ use
from the environment as a shorthand as well while we are at it,
so that you can say:
$ git-env GIT_COMMITTER_ID
GIT_COMMITTER_ID='Junio C Hamano <junkio@cox.net> 1121202267 -0700'
Once we go this route, it may even make sense to have that GIT_COMMITTER_ID
environment variable as well. I don't know..
^ permalink raw reply
* Re: Why is there no git-update-cache --modified (aka I give up)
From: Junio C Hamano @ 2005-07-12 20:51 UTC (permalink / raw)
To: git
In-Reply-To: <pan.2005.07.12.16.16.45.990714@smurf.noris.de>
Matthias Urlichs <smurf <at> smurf.noris.de> writes:
>
> Hi, Marc Singer wrote:
>
> > # git-update-cache `git-diff-cache | cut -f2`
>
> g-d-c should have an option to print file names only. All that cutting
> and argument-backtick-ing gets pretty nasty when there are a lot of files,
> or if they contain special characters.
I concur. I'll add --name-only flag to diff brothers soonish.
Sorry I am at work and have turned the incoming connection to my home network
before I left for work today -- this is the same junkio@cox.net who is guilty
for all your diff problems ;-).
^ permalink raw reply
* [PATCH] git-cvsimport-script: parse multidigit revisions
From: Sven Verdoolaege @ 2005-07-12 21:35 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Matthias Urlichs, Git Mailing List
git-cvsimport-script: parse multidigit revisions.
Previously, git-cvsimport-script would fail
on revisions with more than one digit.
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---
commit 7b5f7bcc470528beb4a0b6ef1c93ce634aaa0158
tree db66d0759f97016bd123e2351aa0e77585e3177b
parent e30e814dbfef7a6e89418863e5d7291a2d53b18f
author Sven Verdoolaege <skimo@kotnet.org> Tue, 12 Jul 2005 22:36:57 +0200
committer Sven Verdoolaege <skimo@kotnet.org> Tue, 12 Jul 2005 22:36:57 +0200
git-cvsimport-script | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-cvsimport-script b/git-cvsimport-script
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -675,7 +675,7 @@ while(<CVS>) {
$state = 9;
} elsif($state == 8) {
$logmsg .= "$_\n";
- } elsif($state == 9 and /^\s+(\S+):(INITIAL|\d(?:\.\d+)+)->(\d(?:\.\d+)+)\s*$/) {
+ } elsif($state == 9 and /^\s+(\S+):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
# VERSION:1.96->1.96.2.1
my $init = ($2 eq "INITIAL");
my $fn = $1;
^ permalink raw reply
* Re: [RFC PATCH] cogito --- don't overwrite metadata files in place (breaks CoW use)
From: Junio C Hamano @ 2005-07-12 21:37 UTC (permalink / raw)
To: git
In-Reply-To: <20050712190552.GA7178@taniwha.stupidest.org>
Chris Wedgwood <cw <at> f00f.org> writes:
> if [ "$newhead" ]; then
> echo "Committed as $newhead."
> - echo $newhead >$_git/HEAD
> + echo_to_file $newhead $_git/HEAD
> [ "$merging" ] && rm $_git/merging $_git/merging-sym $_git/merge-base
Good intentions, but wouldn't the above clobber symlinked HEAD?
Not a fundamental flaw, though. You need to see if it is a symlink,
readlink it (repeatedly until you get a regular file or dangling symlink
target that does not exist --- immediately after git-init-db has such a
HEAD) and run your echo_to_file on the link target.
^ permalink raw reply
* Re: Bootstrapping into git, commit gripes at me
From: Daniel Barkalow @ 2005-07-12 17:04 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Linus Torvalds, Marc Singer, git
In-Reply-To: <7voe98g3ws.fsf@assigned-by-dhcp.cox.net>
On Mon, 11 Jul 2005, Junio C Hamano wrote:
> Linus Torvalds <torvalds@osdl.org> writes:
>
> > But what about the branch name? Should we just ask the user? Together with
> > a flag, like
> >
> > git checkout -b new-branch v2.6.12
> >
> > for somebody who wants to specify the branch name? Or should we pick a
> > random name and add a helper function to rename a branch later?
> >
> > Opinions?
>
> How about treating "master" a temporary thing --- "whatever I
> happen to be working on right now"?
That conflicts with my usage, where I have a single repository for all of
my working directories, with .git/refs and .git/objects being symlinks to
it, but .git/HEAD being different for each branch. The stuff in objects/
and refs/ really shouldn't depend on what you're currently doing for this
reason.
My way of thinking of "master" is that it's a real branch, which is for
all of the situations where you aren't using a specially-designated
branch. For many people, they only do stuff that's not designated
specially; Jeff only does stuff that is designated specially. But if you
do both, you'll want master to be left alone while you work on the side
branch.
-Daniel
*This .sig left intentionally blank*
^ permalink raw reply
* Re: [PATCH] tagger id
From: Eric W. Biederman @ 2005-07-12 22:15 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Git Mailing List
In-Reply-To: <Pine.LNX.4.58.0507121152260.17536@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> Eric,
> I ended up coding the ident stuff a bit differently, and I didn't do done
> the tag/git-id part yet. Can you check out my latest commit (pushed out,
> but it will probably take a few minutes to mirror out), and do the final
> tag stuff based on that?
For the most part it looks sane. I'm not really thrilled that
setup_ident() calls die, and when complaining about the user
name we should probably complain that their sysadmin hated
then if it is over a 1000 characters not their parents :)
I'm also not at all thrilled with global variables. Globals aren't
the source of all evil but they have a lot better claim than goto.
At least real_email and friends are file local. If you like
it and the code works git is you project and I won't complain again.
Since we are still looking at this there is one change in the user
interface I would like to make to simplify things for the end user.
The only time when GIT_COMMITTER != GIT_AUTHOR is in git_commit_script
when we you are making a new commit based on an old commit. Can
we add a command line option to git-commit-write, --author
that will allow the author field to be overridden. Allowing us
to get down to a single set of GIT variables for specifying who
the user is?
That also simplifies the tagging case and answers the question
which environment variables tags should look at, to see who the
user is.
Eric
^ 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