Merge branch 'jc/diff' into next

* jc/diff:
  builtin-diff: call it "git-diff", really.

Makefile

@@ -115,7 +115,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
 SCRIPT_SH = \
 	git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
 	git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
-	git-count-objects.sh git-diff.sh git-fetch.sh \
+	git-count-objects.sh git-fetch.sh \
 	git-format-patch.sh git-ls-remote.sh \
 	git-merge-one-file.sh git-parse-remote.sh \
 	git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
@@ -167,7 +167,8 @@ PROGRAMS = \
 	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
 
-BUILT_INS = git-log$X
+BUILT_INS = git-log$X \
+	git-diff$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)

git-diff.sh

@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Linus Torvalds
-# Copyright (c) 2005 Junio C Hamano
-
-USAGE='[ --diff-options ] <ent>{0,2} [<path>...]'
-SUBDIRECTORY_OK='Yes'
-. git-sh-setup
-
-rev=$(git-rev-parse --revs-only --no-flags --sq "$@") || exit
-flags=$(git-rev-parse --no-revs --flags --sq "$@")
-files=$(git-rev-parse --no-revs --no-flags --sq "$@")
-
-# I often say 'git diff --cached -p' and get scolded by git-diff-files, but
-# obviously I mean 'git diff --cached -p HEAD' in that case.
-case "$rev" in
-'')
-	case " $flags " in
-	*" '--cached' "*)
-		rev='HEAD '
-		;;
-	esac
-esac
-
-# If we have -[123] --ours --theirs --base, don't do --cc by default.
-case " $flags " in
-*" '-"[123]"' "* | *" '--ours' "* | *" '--base' "* | *" '--theirs' "*)
-	cc_or_p=-p ;;
-*)
-	cc_or_p=--cc ;;
-esac
-
-# If we do not have --name-status, --name-only, -r, -c or --stat,
-# default to --cc.
-case " $flags " in
-*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* | *" '-c' "* | \
-*" '--stat' "*)
-	;;
-*)
-	flags="$flags'$cc_or_p' " ;;
-esac
-
-# If we do not have -B, -C, -r, nor -p, default to -M.
-case " $flags " in
-*" '-"[BCMrp]* | *" '--find-copies-harder' "*)
-	;; # something like -M50.
-*)
-	flags="$flags'-M' " ;;
-esac
-
-case "$rev" in
-?*' '?*' '?*)
-	usage
-	;;
-?*' '^?*)
-	begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') &&
-	end=$(expr "$rev" : '.\([0-9a-f]*\). .*') || exit
-	cmd="git-diff-tree $flags $begin $end -- $files"
-	;;
-?*' '?*)
-	cmd="git-diff-tree $flags $rev -- $files"
-	;;
-?*' ')
-	cmd="git-diff-index $flags $rev -- $files"
-	;;
-'')
-	cmd="git-diff-files $flags -- $files"
-	;;
-*)
-	usage
-	;;
-esac
-
-eval "$cmd"

git.c

@@ -48,7 +48,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 		{ "show", cmd_show },
 		{ "fmt-patch", cmd_format_patch },
 		{ "count-objects", cmd_count_objects },
-		{ "diffn", cmd_diff },
+		{ "diff", cmd_diff },
 		{ "push", cmd_push },
 		{ "grep", cmd_grep },
 	};