builtin-diff: call it "git-diff", really.
Call it "git diff" not "git diffn", remove the shell script version, and hardlink the git binary to it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
May 1, 2006 at 22:58 UTC
8ab99476ec2298a43e94949e0bb7aa5125793a28
3 files changed
+4
-77
Makefile
+3
-2
@@ -115,7 +115,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
115
SCRIPT_SH = \
116
git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
117
git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
118
- git-count-objects.sh git-diff.sh git-fetch.sh \
118
+ git-count-objects.sh git-fetch.sh \
119
git-format-patch.sh git-ls-remote.sh \
120
git-merge-one-file.sh git-parse-remote.sh \
121
git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
@@ -167,7 +167,8 @@ PROGRAMS = \
167
git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
168
git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
169
170
-BUILT_INS = git-log$X
170
+BUILT_INS = git-log$X \
171
+ git-diff$X
172
173
# what 'all' will build and 'install' will install, in gitexecdir
174
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
git-diff.sh
deleted
-74
@@ -1,74 +0,0 @@
1
-#!/bin/sh
2
-#
3
-# Copyright (c) 2005 Linus Torvalds
4
-# Copyright (c) 2005 Junio C Hamano
5
-
6
-USAGE='[ --diff-options ] <ent>{0,2} [<path>...]'
7
-SUBDIRECTORY_OK='Yes'
8
-. git-sh-setup
9
-
10
-rev=$(git-rev-parse --revs-only --no-flags --sq "$@") || exit
11
-flags=$(git-rev-parse --no-revs --flags --sq "$@")
12
-files=$(git-rev-parse --no-revs --no-flags --sq "$@")
13
-
14
-# I often say 'git diff --cached -p' and get scolded by git-diff-files, but
15
-# obviously I mean 'git diff --cached -p HEAD' in that case.
16
-case "$rev" in
17
-'')
18
- case " $flags " in
19
- *" '--cached' "*)
20
- rev='HEAD '
21
- ;;
22
- esac
23
-esac
24
-
25
-# If we have -[123] --ours --theirs --base, don't do --cc by default.
26
-case " $flags " in
27
-*" '-"[123]"' "* | *" '--ours' "* | *" '--base' "* | *" '--theirs' "*)
28
- cc_or_p=-p ;;
29
-*)
30
- cc_or_p=--cc ;;
31
-esac
32
-
33
-# If we do not have --name-status, --name-only, -r, -c or --stat,
34
-# default to --cc.
35
-case " $flags " in
36
-*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* | *" '-c' "* | \
37
-*" '--stat' "*)
38
- ;;
39
-*)
40
- flags="$flags'$cc_or_p' " ;;
41
-esac
42
-
43
-# If we do not have -B, -C, -r, nor -p, default to -M.
44
-case " $flags " in
45
-*" '-"[BCMrp]* | *" '--find-copies-harder' "*)
46
- ;; # something like -M50.
47
-*)
48
- flags="$flags'-M' " ;;
49
-esac
50
-
51
-case "$rev" in
52
-?*' '?*' '?*)
53
- usage
54
- ;;
55
-?*' '^?*)
56
- begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') &&
57
- end=$(expr "$rev" : '.\([0-9a-f]*\). .*') || exit
58
- cmd="git-diff-tree $flags $begin $end -- $files"
59
- ;;
60
-?*' '?*)
61
- cmd="git-diff-tree $flags $rev -- $files"
62
- ;;
63
-?*' ')
64
- cmd="git-diff-index $flags $rev -- $files"
65
- ;;
66
-'')
67
- cmd="git-diff-files $flags -- $files"
68
- ;;
69
-*)
70
- usage
71
- ;;
72
-esac
73
-
74
-eval "$cmd"
git.c
+1
-1
@@ -46,7 +46,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
46
{ "log", cmd_log },
47
{ "whatchanged", cmd_whatchanged },
48
{ "show", cmd_show },
49
- { "diffn", cmd_diff },
49
+ { "diff", cmd_diff },
50
};
51
int i;
52