From: Junio C Hamano <junkio@cox.net>
Date: Tue, 27 Feb 2007 10:27:26 +0000 (-0800)
Subject: Merge branch 'np/types' into jc/fetch
X-Git-Tag: v1.5.1-rc1~30^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88459358cdd70246e805b0ee7db7fffb9564f80e;p=git.git

Merge branch 'np/types' into jc/fetch

* np/types: (253 commits)
  get rid of lookup_object_type()
  convert object type handling from a string to a number
  formalize typename(), and add its reverse type_from_string()
  sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
  sha1_file.c: cleanup "offset" usage
  sha1_file.c: cleanup hdr usage
  git-apply: do not fix whitespaces on context lines.
  diff --cc: integer overflow given a 2GB-or-larger file
  mailinfo: do not get confused with logical lines that are too long.
  Documentation: link in 1.5.0.2 material to the top documentation page.
  Documentation: document remote.<name>.tagopt
  GIT 1.5.0.2
  git-remote: support remotes with a dot in the name
  Documentation: describe "-f/-t/-m" options to "git-remote add"
  diff --cc: fix display of symlink conflicts during a merge.
  merge-recursive: fix longstanding bug in merging symlinks
  merge-index: fix longstanding bug in merging symlinks
  diff --cached: give more sensible error message when HEAD is yet to be created.
  Update tests to use test-chmtime
  Add test-chmtime: a utility to change mtime on files
  ...
---

88459358cdd70246e805b0ee7db7fffb9564f80e
diff --cc Makefile
index 181ad9427,8a42be9ba..9f20f8422
--- a/Makefile
+++ b/Makefile
@@@ -280,9 -286,7 +286,8 @@@ BUILTIN_OBJS = 
  	builtin-diff.o \
  	builtin-diff-files.o \
  	builtin-diff-index.o \
- 	builtin-diff-stages.o \
  	builtin-diff-tree.o \
 +	builtin-fetch--tool.o \
  	builtin-fmt-merge-msg.o \
  	builtin-for-each-ref.o \
  	builtin-fsck.o \
diff --cc builtin.h
index 3cad4028d,57e8741ff..9a25b79f8
--- a/builtin.h
+++ b/builtin.h
@@@ -29,9 -29,7 +29,8 @@@ extern int cmd_describe(int argc, cons
  extern int cmd_diff_files(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_index(int argc, const char **argv, const char *prefix);
  extern int cmd_diff(int argc, const char **argv, const char *prefix);
- extern int cmd_diff_stages(int argc, const char **argv, const char *prefix);
  extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
 +extern int cmd_fetch__tool(int argc, const char **argv, const char *prefix);
  extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
  extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
  extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
diff --cc git.c
index a167b1e42,83f3d90ee..2361b5fbb
--- a/git.c
+++ b/git.c
@@@ -240,9 -240,7 +240,8 @@@ static void handle_internal_command(in
  		{ "diff", cmd_diff, RUN_SETUP | USE_PAGER },
  		{ "diff-files", cmd_diff_files, RUN_SETUP },
  		{ "diff-index", cmd_diff_index, RUN_SETUP },
- 		{ "diff-stages", cmd_diff_stages, RUN_SETUP },
  		{ "diff-tree", cmd_diff_tree, RUN_SETUP },
 +		{ "fetch--tool", cmd_fetch__tool, RUN_SETUP },
  		{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
  		{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
  		{ "format-patch", cmd_format_patch, RUN_SETUP },