From e47410aa424c8ee740eb9add9b50ac1ca7ce12a0 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 8 Sep 2014 08:52:41 +0200
Subject: [PATCH] dim: cope better with silent conflict fixup patches

<j4ni> uuugh
---
 dim | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dim b/dim
index 9f0eff3..778410e 100755
--- a/dim
+++ b/dim
@@ -238,7 +238,12 @@ function update_nightly
 			git add -u
 
 			if [[ `git diff --cached --name-status | wc -l` -gt 0 ]]; then
-				git commit --no-edit || true
+				# If the conflict is silent git merge succeeded,
+				# so there's no cached commit message around.
+				# Since it's too hard to detect this reliably
+				# (git scripting is fragile) just try a second
+				# time with a commit message supplied.
+				git commit --no-edit || git commit -m "Applying $fixup_file"
 			fi
 		fi
 
-- 
GitLab