summaryrefslogtreecommitdiff
path: root/git-diff-script
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@osdl.org>2005-08-16 18:06:34 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-16 18:47:22 -0700
commitd288a70030eaa5c205a72b4548635e17f8e523c0 (patch)
treee446e859256bd90a9eefd1cb2406707ea5b9d555 /git-diff-script
parent[PATCH] Add a bit more links to the commands to the main git(7) page. (diff)
downloadtgif-d288a70030eaa5c205a72b4548635e17f8e523c0.tar.xz
[PATCH] Make "git diff" work inside relative subdirectories
We always show the diff as an absolute path, but pathnames to diff are taken relative to the current working directory (and if no pathnames are given, the default ends up being all of the current working directory). Note that "../xyz" also works, so you can do cd linux/drivers/char git diff ../block and it will generate a diff of the linux/drivers/block changes. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-diff-script')
-rwxr-xr-xgit-diff-script4
1 files changed, 1 insertions, 3 deletions
diff --git a/git-diff-script b/git-diff-script
index 03ed555e77..926f594be4 100755
--- a/git-diff-script
+++ b/git-diff-script
@@ -1,7 +1,5 @@
#!/bin/sh
-. git-sh-setup-script || die "Not a git archive"
-
-rev=($(git-rev-parse --revs-only "$@"))
+rev=($(git-rev-parse --revs-only "$@")) || exit
flags=($(git-rev-parse --no-revs --flags "$@"))
files=($(git-rev-parse --no-revs --no-flags "$@"))
case "${#rev[*]}" in