From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 5 Oct 2006 09:29:57 +0000 (+0200)
Subject: git.el: Fixed inverted "renamed from/to" message.
X-Git-Tag: v1.4.3-rc2~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c530c5aa31f44adafd1f4ecb05223024162e689c;p=git.git

git.el: Fixed inverted "renamed from/to" message.

The deleted file should be labeled "renamed to" and the added file
"renamed from", not the other way around (duh!)

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 68de9be0c..5354cd67b 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -422,8 +422,8 @@ and returns the process output as a string."
         (propertize
          (concat "   ("
                  (if (eq state 'copy) "copied from "
-                   (if (eq (git-fileinfo->state info) 'added) "renamed to "
-                     "renamed from "))
+                   (if (eq (git-fileinfo->state info) 'added) "renamed from "
+                     "renamed to "))
                  (git-escape-file-name (git-fileinfo->orig-name info))
                  ")") 'face 'git-status-face)
       "")))