From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 4/8] mv: split submodule move preparation code out Date: Fri, 8 Aug 2014 20:10:58 +0700 Message-ID: <1407503462-32632-5-git-send-email-pclouds@gmail.com> References: <1407503462-32632-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Aug 08 15:11:43 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XFjxF-0000m3-EJ for gcvg-git-2@plane.gmane.org; Fri, 08 Aug 2014 15:11:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756695AbaHHNL3 convert rfc822-to-quoted-printable (ORCPT ); Fri, 8 Aug 2014 09:11:29 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:61622 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756251AbaHHNL2 (ORCPT ); Fri, 8 Aug 2014 09:11:28 -0400 Received: by mail-pa0-f51.google.com with SMTP id ey11so7301757pad.38 for ; Fri, 08 Aug 2014 06:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=4xd6gHK/q3uRyoCsO/WOylZC/xkC3THlGP3pxBwxe0o=; b=YDhOBkAsN7cdBD98R5XzffP0r1vGVRliQdgNM+S2OIiB3MpryuPNSsYoQ8FqD6Dpp9 wGwihIEgy5w0jHwps7R9RtsAlAo1PGmI35OH+8qYx2CnnaS0l3XmZaj6PoJKRYbzDtLo 7Zw3LhzZoms31tfSiSPZ5xy2TXr22BeoMChfnXk5mhbThPURpuWkwomTUNdvQB+nPLUy ys4ENoYGUJ7q5wVlDw+QQcVXNiVaP1sxwRFhAXMkAYgXM6XIpFbQS+34KlVXc1AbM377 fvJrkg84ldbT6mG93AuaIHJepzqJbFBicz+YEy1ZBipo9aGS1XSnBBwUxVIclDJ505Ma mqlA== X-Received: by 10.66.192.73 with SMTP id he9mr24525017pac.88.1407503488022; Fri, 08 Aug 2014 06:11:28 -0700 (PDT) Received: from lanh ([115.73.206.39]) by mx.google.com with ESMTPSA id dw8sm25473693pab.35.2014.08.08.06.11.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Aug 2014 06:11:27 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Fri, 08 Aug 2014 20:11:30 +0700 X-Mailer: git-send-email 2.1.0.rc0.78.gc0d8480 In-Reply-To: <1407503462-32632-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- builtin/mv.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 5c6f58f..e192f2d 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -66,6 +66,23 @@ static void move_up_one(void *p, int nmemb, int size= ) static struct lock_file lock_file; #define SUBMODULE_WITH_GITDIR ((const char *)1) =20 +static void prepare_move_submodule(const char *src, int first, + const char **submodule_gitfile) +{ + struct strbuf submodule_dotgit =3D STRBUF_INIT; + if (!S_ISGITLINK(active_cache[first]->ce_mode)) + die (_("Directory %s is in index and no submodule?"), src); + if (!is_staging_gitmodules_ok()) + die (_("Please, stage your changes to .gitmodules or stash them to p= roceed")); + strbuf_addf(&submodule_dotgit, "%s/.git", src); + *submodule_gitfile =3D read_gitfile(submodule_dotgit.buf); + if (*submodule_gitfile) + *submodule_gitfile =3D xstrdup(*submodule_gitfile); + else + *submodule_gitfile =3D SUBMODULE_WITH_GITDIR; + strbuf_release(&submodule_dotgit); +} + int cmd_mv(int argc, const char **argv, const char *prefix) { int i, gitmodules_modified =3D 0; @@ -137,20 +154,10 @@ int cmd_mv(int argc, const char **argv, const cha= r *prefix) bad =3D _("cannot move directory over file"); else if (src_is_dir) { int first =3D cache_name_pos(src, length); - if (first >=3D 0) { - struct strbuf submodule_dotgit =3D STRBUF_INIT; - if (!S_ISGITLINK(active_cache[first]->ce_mode)) - die (_("Directory %s is in index and no submodule?"), src); - if (!is_staging_gitmodules_ok()) - die (_("Please, stage your changes to .gitmodules or stash them t= o proceed")); - strbuf_addf(&submodule_dotgit, "%s/.git", src); - submodule_gitfile[i] =3D read_gitfile(submodule_dotgit.buf); - if (submodule_gitfile[i]) - submodule_gitfile[i] =3D xstrdup(submodule_gitfile[i]); - else - submodule_gitfile[i] =3D SUBMODULE_WITH_GITDIR; - strbuf_release(&submodule_dotgit); - } else { + if (first >=3D 0) + prepare_move_submodule(src, first, + submodule_gitfile + i); + else { const char *src_w_slash =3D add_slash(src); int last, len_w_slash =3D length + 1; =20 --=20 2.1.0.rc0.78.gc0d8480