SF.net SVN: geany: [2654] trunk

[eht16 at users.sourceforge.net]

Revision: 2654
          http://geany.svn.sourceforge.net/geany/?rev=2654&view=rev
Author:   eht16
Date:     2008-06-06 07:53:40 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
Fix diff output when files were manually added with 'git add' in GIT repositories (patch by Yura Siamashka).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/vcdiff.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-06 14:27:08 UTC (rev 2653)
+++ trunk/ChangeLog	2008-06-06 14:53:40 UTC (rev 2654)
@@ -6,6 +6,9 @@
  * configure.in, Makefile.am, geany.desktop.in.in, geany.desktop.in:
    Rename geany.desktop.in.in in geany.desktop.in as we need to
    process it only once.
+ * plugins/vcdiff.c:
+   Fix diff output when files were manually added with 'git add'
+   in GIT repositories (patch by Yura Siamashka).
 
 
 2008-06-06  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/plugins/vcdiff.c
===================================================================
--- trunk/plugins/vcdiff.c	2008-06-06 14:27:08 UTC (rev 2653)
+++ trunk/plugins/vcdiff.c	2008-06-06 14:53:40 UTC (rev 2654)
@@ -78,9 +78,9 @@
 static void* CVS_COMMANDS[] = { CVS_CMD_DIFF_FILE, CVS_CMD_DIFF_DIR, CVS_CMD_DIFF_PROJECT };
 
 
-static const gchar* GIT_CMD_DIFF_FILE[] = {"git", "diff", BASE_FILENAME,  NULL};
-static const gchar* GIT_CMD_DIFF_DIR[]  = {"git", "diff", NULL};
-static const gchar* GIT_CMD_DIFF_PROJECT[] = {"git", "diff", NULL};
+static const gchar* GIT_CMD_DIFF_FILE[] = {"git", "diff", "HEAD", "--", BASE_FILENAME,  NULL};
+static const gchar* GIT_CMD_DIFF_DIR[]  = {"git", "diff", "HEAD", NULL};
+static const gchar* GIT_CMD_DIFF_PROJECT[] = {"git", "diff", "HEAD", NULL};
 
 static const gchar* GIT_ENV_DIFF_FILE[] = {"PAGER=cat", NULL};
 static const gchar* GIT_ENV_DIFF_DIR[]  = {"PAGER=cat", NULL};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.