From 376045cf60bea92bc7ace03e94dd1fcc6ce50310 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@ucw.cz>
Date: Fri, 22 Jan 2010 00:57:34 +0100
Subject: [PATCH] git_darcs_fetch(): Move from shlib to jobd/update.sh

---
 git.git        | 2 +-
 jobd/update.sh | 8 ++++++++
 shlib.sh       | 8 --------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/git.git b/git.git
index 297f955..b183797 160000
--- a/git.git
+++ b/git.git
@@ -1 +1 @@
-Subproject commit 297f955c86062613dec16839547bef6071cc2491
+Subproject commit b1837974c1556358292050376a0f70c0f29e52c1
diff --git a/jobd/update.sh b/jobd/update.sh
index dd31dbb..1dd5e57 100755
--- a/jobd/update.sh
+++ b/jobd/update.sh
@@ -2,6 +2,14 @@
 
 . @basedir@/shlib.sh
 
+# fast-import with error handling
+git_darcs_fetch() {
+	darcs-fast-export --export-marks=$(pwd)/dfe-marks --import-marks=$(pwd)/dfe-marks "$1" | \
+		git fast-import --export-marks=$(pwd)/gfi-marks --import-marks=$(pwd)/gfi-marks
+	[ $PIPESTATUS[0] = 0 -a $PIPESTATUS[1] = 0 ]
+	return $?
+}
+
 set -e
 
 proj="$1"
diff --git a/shlib.sh b/shlib.sh
index 55298eb..5224073 100644
--- a/shlib.sh
+++ b/shlib.sh
@@ -101,11 +101,3 @@ get_repo_list() {
 		[ $id -lt 65536 ] || echo "$name"
 	done
 }
-
-# fast-import with error handling
-git_darcs_fetch() {
-	darcs-fast-export --export-marks=$(pwd)/dfe-marks --import-marks=$(pwd)/dfe-marks "$1" | \
-		git fast-import --export-marks=$(pwd)/gfi-marks --import-marks=$(pwd)/gfi-marks
-	[ $PIPESTATUS[0] = 0 -a $PIPESTATUS[1] = 0 ]
-	return $?
-}
-- 
2.11.4.GIT