diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 19:07:24 +0300 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 19:07:24 +0300 |
| commit | 76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a (patch) | |
| tree | 80a6b54d21978b5c3879662bdc4f5951f804b808 /fast-import.c | |
| parent | b715cfbba4083d25ec0d0f94e440ad734607ddb0 (diff) | |
| parent | 73a2acc0a09829f887fdf2dbcfba217102227932 (diff) | |
Merge branch 'master' into sp/gfi
git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it. This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.
This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).
Conflicts:
git-compat-util.h
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 487a91a4ee..f62a5a9f6c 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1927,7 +1927,6 @@ int main(int argc, const char **argv) int i; uintmax_t total_count, duplicate_count; - setup_ident(); git_config(git_default_config); for (i = 1; i < argc; i++) { |