From: Brad King <brad.king@kitware.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Avery Pennarun <apenwarr@gmail.com>,
Lars Hjemli <hjemli@gmail.com>
Subject: [PATCH v2 1/2] Test update-index for a gitlink to a .git file
Date: Fri, 8 Jan 2010 22:36:40 -0500 [thread overview]
Message-ID: <1263008201-27429-2-git-send-email-brad.king@kitware.com> (raw)
In-Reply-To: <32541b131001081524g43d54a44i582dd286c1dfe7a5@mail.gmail.com>
Check that update-index recognizes a submodule that uses a .git file.
Currently it works when the .git file specifies an absolute path, but
not when it specifies a relative path.
Signed-off-by: Brad King <brad.king@kitware.com>
---
t/t2104-update-index-gitfile.sh | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
create mode 100755 t/t2104-update-index-gitfile.sh
diff --git a/t/t2104-update-index-gitfile.sh b/t/t2104-update-index-gitfile.sh
new file mode 100755
index 0000000..ba71984
--- /dev/null
+++ b/t/t2104-update-index-gitfile.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Copyright (c) 2010 Brad King
+#
+
+test_description='git update-index for gitlink to .git file.
+'
+
+. ./test-lib.sh
+
+test_expect_success 'submodule with absolute .git file' '
+ mkdir sub1 &&
+ (cd sub1 &&
+ git init &&
+ REAL="$(pwd)/.real" &&
+ mv .git "$REAL"
+ echo "gitdir: $REAL" >.git &&
+ test_commit first)
+'
+
+test_expect_success 'add gitlink to absolute .git file' '
+ git update-index --add -- sub1
+'
+
+test_expect_success 'submodule with relative .git file' '
+ mkdir sub2 &&
+ (cd sub2 &&
+ git init &&
+ mv .git .real &&
+ echo "gitdir: .real" >.git &&
+ test_commit first)
+'
+
+test_expect_failure 'add gitlink to relative .git file' '
+ git update-index --add -- sub2
+'
+
+test_done
--
1.6.5
next prev parent reply other threads:[~2010-01-09 3:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-08 22:36 [PATCH 0/2] Support relative .git file in a submodule Brad King
2010-01-08 22:36 ` [PATCH 1/2] Test update-index for a gitlink to a .git file Brad King
2010-01-08 22:36 ` [PATCH 2/2] Handle relative paths in submodule .git files Brad King
2010-01-08 23:09 ` [PATCH 0/2] Support relative .git file in a submodule Junio C Hamano
2010-01-08 23:24 ` Avery Pennarun
2010-01-09 3:36 ` [PATCH v2 " Brad King
2010-01-09 17:20 ` Junio C Hamano
2010-01-09 3:36 ` Brad King [this message]
2010-01-09 3:36 ` [PATCH v2 2/2] Handle relative paths in submodule .git files Brad King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1263008201-27429-2-git-send-email-brad.king@kitware.com \
--to=brad.king@kitware.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hjemli@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).