From 3c8ee31f8adbcacb42108c2823fa5ef1235cc610 Mon Sep 17 00:00:00 2001
From: Marcus Farkas <toothlessgear@finitebox.com>
Date: Mon, 17 Jun 2013 23:32:48 +0000
Subject: [PATCH] fix docker version git output Upstream-commit:
 b25bcf1a666ebef26e2acfa132fa2b72d47d0805 Component: engine

---
 components/engine/AUTHORS  | 1 +
 components/engine/Makefile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/engine/AUTHORS b/components/engine/AUTHORS
index eb90cd02d9..89fa178c3b 100644
--- a/components/engine/AUTHORS
+++ b/components/engine/AUTHORS
@@ -41,6 +41,7 @@ Jérôme Petazzoni <jerome.petazzoni@dotcloud.com>
 Ken Cochrane <kencochrane@gmail.com>
 Kevin J. Lynagh <kevin@keminglabs.com>
 Louis Opter <kalessin@kalessin.fr>
+Marcus Farkas <toothlessgear@finitebox.com>
 Maxim Treskin <zerthurd@gmail.com>
 Michael Crosby <crosby.michael@gmail.com>
 Mikhail Sobolev <mss@mawhrin.net>
diff --git a/components/engine/Makefile b/components/engine/Makefile
index eca409c967..8676014ad4 100644
--- a/components/engine/Makefile
+++ b/components/engine/Makefile
@@ -17,7 +17,7 @@ endif
 GIT_COMMIT = $(shell git rev-parse --short HEAD)
 GIT_STATUS = $(shell test -n "`git status --porcelain`" && echo "+CHANGES")
 
-BUILD_OPTIONS = -ldflags "-X main.GIT_COMMIT $(GIT_COMMIT)$(GIT_STATUS)"
+BUILD_OPTIONS = -ldflags "-X main.GITCOMMIT $(GIT_COMMIT)$(GIT_STATUS)"
 
 SRC_DIR := $(GOPATH)/src