summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2006-08-15 17:23:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-16 04:22:20 (GMT)
commit96f1e58f524fac8607cfc38896b365b6e8365b51 (patch)
treeb30b39c8333a821b18c5a4313eda9d7e8ef2d844 /merge-index.c
parentc9c3470aec3a1d753ac1e5f21358f6374c1add95 (diff)
downloadgit-96f1e58f524fac8607cfc38896b365b6e8365b51.zip
git-96f1e58f524fac8607cfc38896b365b6e8365b51.tar.gz
git-96f1e58f524fac8607cfc38896b365b6e8365b51.tar.bz2
remove unnecessary initializations
[jc: I needed to hand merge the changes to the updated codebase, so the result needs to be checked.] Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-index.c')
-rw-r--r--merge-index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-index.c b/merge-index.c
index a9c8cc1..646d090 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -4,7 +4,7 @@
#include "cache.h"
-static const char *pgm = NULL;
+static const char *pgm;
static const char *arguments[8];
static int one_shot, quiet;
static int err;