From: Junio C Hamano <junkio@cox.net>
Date: Thu, 20 Apr 2006 06:52:30 +0000 (-0700)
Subject: Merge branch 'jc/unresolve' into next
X-Git-Tag: v1.4.1-rc1~199
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f31613d45afa1e5c87c4a9a964ef9b474ef73932?hp=-c

Merge branch 'jc/unresolve' into next

* jc/unresolve:
git-update-index --unresolve
---

f31613d45afa1e5c87c4a9a964ef9b474ef73932
diff --combined .gitignore
index a536f32497,b5959d6311..145f8555ad
--- a/.gitignore
+++ b/.gitignore
@@@ -111,7 -111,6 +111,6 @@@ git-ta
  git-tar-tree
  git-unpack-file
  git-unpack-objects
- git-unresolve
  git-update-index
  git-update-ref
  git-update-server-info
@@@ -124,7 -123,6 +123,7 @@@ git-write-tre
  git-core-*/?*
  test-date
  test-delta
 +test-gsimm
  common-cmds.h
  *.tar.gz
  *.dsc
diff --combined Makefile
index 858e58ddd2,3ecd674c14..9cbb90b95d
--- a/Makefile
+++ b/Makefile
@@@ -165,8 -165,7 +165,7 @@@ PROGRAMS = 
  	git-upload-pack$X git-verify-pack$X git-write-tree$X \
  	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
  	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
- 	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
- 	git-unresolve$X
+ 	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
  
  BUILT_INS = git-log$X
  
@@@ -607,9 -606,6 +606,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) $^ -lz
  
 +test-gsimm$X: test-gsimm.c gsimm.o rabinpoly.o
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
 +
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
  
@@@ -658,7 -654,6 +657,7 @@@ clean
  	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
  		$(LIB_FILE) $(XDIFF_LIB)
  	rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
 +	rm -f test-date$X test-delta$X test-gsimm$X
  	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
  	rm -rf $(GIT_TARNAME)
  	rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz