[PATCH 01/25] diff.c: readability fix
From: Stefan Beller <hidden>
Date: 2017-06-30 00:07:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
We already have dereferenced 'p->two' into a local variable 'two'. Use that. Signed-off-by: Stefan Beller <redacted> Signed-off-by: Junio C Hamano <redacted> --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 00b4c86698..2874dfc6fc 100644
--- a/diff.c
+++ b/diff.c@@ -3282,8 +3282,8 @@ static void run_diff(struct diff_filepair *p, struct diff_options *o) const char *other; const char *attr_path; - name = p->one->path; - other = (strcmp(name, p->two->path) ? p->two->path : NULL); + name = one->path; + other = (strcmp(name, two->path) ? two->path : NULL); attr_path = name; if (o->prefix_length) strip_prefix(o->prefix_length, &name, &other);
--
2.13.0.31.g9b732c453e