From 173a659ab9fcdbc18b388d1fc29c93772683e3f0 Mon Sep 17 00:00:00 2001
From: Calvin Spealman <ironfroggy@ironfroggy.socialserve.com>
Date: Tue, 13 Nov 2007 16:12:46 -0500
Subject: [PATCH] Actually compare the right things for the changed file list!

---
 bin/updatebranch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/updatebranch b/bin/updatebranch
index 72a0b87..ee1f5c0 100755
--- a/bin/updatebranch
+++ b/bin/updatebranch
@@ -2,7 +2,7 @@
 # updatebranch
 
 git fetch origin `currentbranchname`
-CHANGEDFILES=$(git diff timeclock..origin/lacounty | grep "diff --git"|cut -d" " -f3|cut -d"/" -f2-)
+CHANGEDFILES=$(git diff HEAD...FETCH_HEAD | grep "diff --git"|cut -d" " -f3|cut -d"/" -f2-)
 rebasebranch origin/`currentbranchname`
 if [[ $CHANGEDFILES ]]; then
 	echo "The following files have been updated:"
-- 
2.11.4.GIT