On Jan 21, 2010, at 2:37 PM, Linus Torvalds wrote:
> ---
> builtin-add.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
> read-cache.c | 78 ---------------------------------------------------------
> 2 files changed, 76 insertions(+), 78 deletions(-)
>
> diff --git a/builtin-add.c b/builtin-add.c
> index cb6e590..2705f8d 100644
I've recently tried building "master" from git://git.kernel.org/pub/scm/git/git.git, and got the following error:
$ make
...snip...
LINK git-fast-import
Undefined symbols:
"_git_mailmap_file", referenced from:
_git_default_config in libgit.a(config.o)
ld: symbol(s) not found
collect2: ld returned 1 exit status
make: *** [git-fast-import] Error 1
When I bisect, I find this commit to blame:
$ git bisect start master v1.6.6.1
Bisecting: 197 revisions left to test after this (roughly 8 steps)
[f8eb50f60b5c8efda3529fcf89517080c686ce0b] Merge branch 'jh/commit-status'
$ git bisect run make -j2
running make -j2
GIT_VERSION = 1.6.6.240.gf8eb5
...snip...
fb7d3f32b283a3847e6f151a06794abd14ffd81b is the first bad commit
commit fb7d3f32b283a3847e6f151a06794abd14ffd81b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu Jan 21 11:37:38 2010 -0800
I also verified that it fails from with "make clean; make", so a dirty tree or -j2 aren't to blame. I'm not terribly familiar with the code base, so I'm a bit puzzled about why this commit would have cause the error that it does; I don't see any obvious connection between add_files_to_cache() and git_mailmap_file.
Can anyone explain why I'd be seeing such an error? Is this a problem on my end?
$ uname -a
Darwin erlang.local 10.2.0 Darwin Kernel Version 10.2.0: Tue Nov 3 10:37:10 PST 2009; root:xnu-1486.2.11~1/RELEASE_I386 i386
$ gcc --version
i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5646) (dot 1)
Copyright (C) 2007 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html