Merge branch 'master' of git://repo.or.cz/git/fastimport
authorJunio C Hamano <junkio@cox.net>
Wed, 7 Feb 2007 03:33:22 +0000 (19:33 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 7 Feb 2007 03:33:22 +0000 (19:33 -0800)
* 'master' of git://repo.or.cz/git/fastimport: (81 commits)
S_IFLNK != 0140000
Don't do non-fastforward updates in fast-import.
Support RFC 2822 date parsing in fast-import.
Minor fast-import documentation corrections.
Remove unnecessary null pointer checks in fast-import.
Correct fast-import timezone documentation.
Correct minor style issue in fast-import.
Correct compiler warnings in fast-import.
Remove --branch-log from fast-import.
Initial draft of fast-import documentation.
Don't support shell-quoted refnames in fast-import.
Reduce memory usage of fast-import.
Include checkpoint command in the BNF.
Accept 'inline' file data in fast-import commit structure.
Reduce value duplication in t9300-fast-import.
Create test case for fast-import.
Support delimited data regions in fast-import.
Remove unnecessary options from fast-import.
Use fixed-size integers when writing out the index in fast-import.
Always use struct pack_header for pack header in fast-import.
...

1  2 
Makefile
diff --combined Makefile
index fc98b27c59e66e7567a3d07c91f5ef15235f16c6,a00c5ab42690aebff8d15d3391928f42d24d852d..2407bbee49e1c2e94e81550d175a05f214f5db4a
+++ b/Makefile
@@@ -194,6 -194,7 +194,7 @@@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH
  PROGRAMS = \
        git-convert-objects$X git-fetch-pack$X git-fsck$X \
        git-hash-object$X git-index-pack$X git-local-fetch$X \
+       git-fast-import$X \
        git-merge-base$X \
        git-daemon$X \
        git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
@@@ -504,7 -505,7 +505,7 @@@ ifdef NO_D_INO_IN_DIREN
        BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
  endif
  ifdef NO_C99_FORMAT
 -      ALL_CFLAGS += -DNO_C99_FORMAT
 +      BASIC_CFLAGS += -DNO_C99_FORMAT
  endif
  ifdef NO_SYMLINK_HEAD
        BASIC_CFLAGS += -DNO_SYMLINK_HEAD