summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Smelkov <kirr@mns.spb.ru>2012-11-13 12:30:17 (GMT)
committerPat Thoyts <patthoyts@users.sourceforge.net>2012-11-13 23:52:14 (GMT)
commit552ee61ece4dad7a42012d83a7271e4b5464cb2e (patch)
treed3d52b3938e3b56488d4dcca614dccc2661908ef
parentf6dd784ed4c1705d465b1238f9a5971f2733e582 (diff)
downloadgit-552ee61ece4dad7a42012d83a7271e4b5464cb2e.zip
git-552ee61ece4dad7a42012d83a7271e4b5464cb2e.tar.gz
git-552ee61ece4dad7a42012d83a7271e4b5464cb2e.tar.bz2
git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
Commit e3d06ca9 (git-gui: Detect full path when parsing arguments) broke git gui blame rev path-not-present-in-worktree in particular this does not work anymore: # in linux.git $ git gui blame 2bb8c26242c2393b097a993ffe9b003ec9b85395 drivers/net/sky2.c This patch restores the original functionality in this case. Acked-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
-rwxr-xr-xgit-gui.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 89f636f..e133331 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3015,6 +3015,7 @@ blame {
if {$is_path} {
if {$path ne {}} usage
+ set path [normalize_relpath $_prefix$a]
break
} elseif {$a eq {--}} {
if {$path ne {}} {