[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      13/11/15 23:03:23

  Modified:             ChangeLog git-r3.eclass
  Log:
  Use shallow clones for local repos. Bug #491260.

Revision  Changes    Path
1.1056               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1056&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1056&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1055&r2=1.1056

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1055
retrieving revision 1.1056
diff -u -r1.1055 -r1.1056
--- ChangeLog	11 Nov 2013 19:47:39 -0000	1.1055
+++ ChangeLog	15 Nov 2013 23:03:23 -0000	1.1056
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1055 2013/11/11 19:47:39 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1056 2013/11/15 23:03:23 mgorny Exp $
+
+  15 Nov 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
+  Use shallow clones for local repos. Bug #491260.
 
   11 Nov 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Sync with qt overlay. Changes should affect only live ebuilds.



1.23                 eclass/git-r3.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.22&r2=1.23

Index: git-r3.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- git-r3.eclass	30 Oct 2013 19:21:12 -0000	1.22
+++ git-r3.eclass	15 Nov 2013 23:03:23 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.22 2013/10/30 19:21:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.23 2013/11/15 23:03:23 mgorny Exp $
 
 # @ECLASS: git-r3.eclass
 # @MAINTAINER:
@@ -354,6 +354,20 @@
 	return ${main_ret}
 }
 
+# @FUNCTION: _git-r3_is_local_repo
+# @USAGE: <repo-uri>
+# @INTERNAL
+# @DESCRIPTION:
+# Determine whether the given URI specifies a local (on-disk)
+# repository.
+_git-r3_is_local_repo() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local uri=${1}
+
+	[[ ${uri} == file://* || ${uri} == /* ]]
+}
+
 # @FUNCTION: git-r3_fetch
 # @USAGE: [<repo-uri> [<remote-ref> [<local-id>]]]
 # @DESCRIPTION:
@@ -440,6 +454,10 @@
 			nonshallow=1
 		fi
 
+		# trying to do a shallow clone of a local repo makes git try to
+		# write to the repo. we don't want that to happen.
+		_git-r3_is_local_repo "${r}" && nonshallow=1
+
 		# 1. if we need a non-shallow clone and we have a shallow one,
 		#    we need to unshallow it explicitly.
 		# 2. if we want a shallow clone, we just pass '--depth 1'