From ce73bd258f6ae49ca8c31bd9bda9d6d482866cab Mon Sep 17 00:00:00 2001
From: Thomas Orozco <thomas@orozco.fr>
Date: Sun, 8 Nov 2015 20:12:20 +0100
Subject: [PATCH 1/2] Build: ensure the correct git directory is used

If Tini is built without its own .git directory, but within another
git directory (i.e. the tarball was extracted in a directory
that happens to be a git tree), then we end up with the wrong
git version in `tini -h`.

This actually happens in the Alpine builds (e.g. Tini 0.8.3 in
Alpine has git hash d89e144, which is a Aports commit hash, not
a Tini commit hash:

https://github.com/alpinelinux/aports/commit/d89e144

This patch forces git to use the current git directory, or to not
use one at all (which is fine, since in that case Tini is
presumably being built from a release tarball).
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c00dea..d3e26a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,14 +8,14 @@ set (tini_VERSION_PATCH 3)
 
 # Extract git version and dirty-ness
 execute_process (
-  COMMAND git log -n 1 --date=local --pretty=format:%h
+  COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" log -n 1 --date=local --pretty=format:%h
   WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
   RESULT_VARIABLE git_version_check_ret
   OUTPUT_VARIABLE tini_VERSION_GIT
 )
 
 execute_process(
-  COMMAND git status --porcelain --untracked-files=no
+  COMMAND git --git-dir "${PROJECT_SOURCE_DIR}/.git" --work-tree "${PROJECT_SOURCE_DIR}" status --porcelain --untracked-files=no
   WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
   OUTPUT_VARIABLE git_dirty_check_out
 )

From eb094de175bd5ad576dc393b9c829348f0b4a8fc Mon Sep 17 00:00:00 2001
From: Thomas Orozco <thomas@orozco.fr>
Date: Fri, 20 Nov 2015 21:45:34 +0100
Subject: [PATCH 2/2] Release 0.8.4

---
 .travis.yml    | 4 ++--
 CMakeLists.txt | 2 +-
 README.md      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2c5e56d..27157df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,8 +35,8 @@ deploy:
   file:
     - "./dist/tini"
     - "./dist/tini-static"
-    - "./dist/tini_0.8.3.deb"
-    - "./dist/tini_0.8.3.rpm"
+    - "./dist/tini_0.8.4.deb"
+    - "./dist/tini_0.8.4.rpm"
   on:
     repo: krallin/tini
     tags: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3e26a8..07304fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project (tini C)
 # Config
 set (tini_VERSION_MAJOR 0)
 set (tini_VERSION_MINOR 8)
-set (tini_VERSION_PATCH 3)
+set (tini_VERSION_PATCH 4)
 
 # Extract git version and dirty-ness
 execute_process (
diff --git a/README.md b/README.md
index 7028265..e547627 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ In Docker, you will want to use an entrypoint so you don't have to remember
 to manually invoke Tini:
 
     # Add Tini
-    ENV TINI_VERSION v0.8.3
+    ENV TINI_VERSION v0.8.4
     ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
     RUN chmod +x /tini
     ENTRYPOINT ["/tini", "--"]