From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 27 Apr 2005 17:21:13 +0000 (-0700)
Subject: diff.c: don't add extra '/' to pathname
X-Git-Tag: v0.99~723
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4765dd57e6115d6e04e26a652676f02abe9c143d;p=git.git

diff.c: don't add extra '/' to pathname

The "base" string already contains any finishing "/", so the way
to get the full pathname is to just concatenate the base and
path directly, with no extra slashes in between.
---

diff --git a/diff.c b/diff.c
index 73834898f..4cc41f097 100644
--- a/diff.c
+++ b/diff.c
@@ -256,7 +256,6 @@ void diff_addremove(int addremove, unsigned mode,
 	
 	if (path) {
 		strcpy(concatpath, base);
-		strcat(concatpath, "/");
 		strcat(concatpath, path);
 	}
 	run_external_diff(path ? concatpath : base, one, two);
@@ -278,7 +277,6 @@ void diff_change(unsigned old_mode, unsigned new_mode,
 
 	if (path) {
 		strcpy(concatpath, base);
-		strcat(concatpath, "/");
 		strcat(concatpath, path);
 	}
 	run_external_diff(path ? concatpath : base, &spec[0], &spec[1]);