Merge branch 'ew/tests' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 26 May 2006 07:51:01 +0000 (00:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 26 May 2006 07:51:01 +0000 (00:51 -0700)
* ew/tests:
t6000lib: workaround a possible dash bug
t5500-fetch-pack: remove local (bashism) usage.
tests: Remove heredoc usage inside quotes
t3300-funny-names: shell portability fixes
git-format-patch --start-number <n>
Don't write directly to a make target ($@).
bogus "fatal: Not a git repository"
Documentation/Makefile: remove extra /
cvsimport: avoid "use" with :tag

1  2 
Makefile
diff --combined Makefile
index 5f8ea1817931eb522a5627d923473fac27c42260,5ad16a0f4511664210426125173d0fc52c9a6b2a..b6fce394e9905af9a137f13fc5af6b300f7f2b7a
+++ b/Makefile
@@@ -210,7 -210,7 +210,7 @@@ DIFF_OBJS = 
        diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
 -      blob.o commit.o connect.o csum-file.o base85.o \
 +      blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
        date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
        object.o pack-check.o patch-delta.o path.o pkt-line.o \
        quote.o read-cache.o refs.o run-command.o dir.o \
@@@ -496,37 -496,43 +496,43 @@@ $(BUILT_INS): git$
        rm -f $@ && ln git$X $@
  
  common-cmds.h: Documentation/git-*.txt
-       ./generate-cmdlist.sh > $@
+       ./generate-cmdlist.sh > $@+
+       mv $@+ $@
  
  $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
-       rm -f $@
+       rm -f $@ $@+
        sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
            -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
            -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
-           $@.sh >$@
-       chmod +x $@
+           $@.sh >$@+
+       chmod +x $@+
+       mv $@+ $@
  
  $(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl
-       rm -f $@
+       rm -f $@ $@+
        sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-           $@.perl >$@
-       chmod +x $@
+           $@.perl >$@+
+       chmod +x $@+
+       mv $@+ $@
  
  $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
-       rm -f $@
+       rm -f $@ $@+
        sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
            -e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR_SQ)|g' \
            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-           $@.py >$@
-       chmod +x $@
+           $@.py >$@+
+       chmod +x $@+
+       mv $@+ $@
  
  git-cherry-pick: git-revert
-       cp $< $@
+       cp $< $@+
+       mv $@+ $@
  
  git-status: git-commit
-       cp $< $@
+       cp $< $@+
+       mv $@+ $@
  
  # These can record GIT_VERSION
  git$X git.spec \
@@@ -620,9 -626,6 +626,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
  
 +test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 +      $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +
  check:
        for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
@@@ -656,7 -659,8 +662,8 @@@ install-doc
  ### Maintainer's dist rules
  
  git.spec: git.spec.in
-       sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
+       sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
+       mv $@+ $@
  
  GIT_TARNAME=git-$(GIT_VERSION)
  dist: git.spec git-tar-tree
@@@ -683,7 -687,7 +690,7 @@@ dist-doc
        :
        rm -fr .doc-tmp-dir
        mkdir .doc-tmp-dir .doc-tmp-dir/man1 .doc-tmp-dir/man7
-       $(MAKE) -C Documentation DESTDIR=. \
+       $(MAKE) -C Documentation DESTDIR=./ \
                man1=../.doc-tmp-dir/man1 \
                man7=../.doc-tmp-dir/man7 \
                install
@@@ -727,4 -731,3 +734,3 @@@ check-docs:
                *) echo "no link: $$v";; \
                esac ; \
        done | sort