From: Jens Lehmann <Jens.Lehmann@web•de>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git (Jun 2011, #05; Thu, 30)
Date: Sat, 02 Jul 2011 20:46:59 +0200 [thread overview]
Message-ID: <4E0F67A3.2030001@web.de> (raw)
In-Reply-To: <7viprmq4sy.fsf@alter.siamese.dyndns.org>
Am 01.07.2011 01:26, schrieb Junio C Hamano:
> * jl/submodule-add-relurl-wo-upstream (2011-06-06) 3 commits
> - submodule add: clean up duplicated code
> - submodule add: allow relative repository path even when no url is set
> - submodule add: test failure when url is not configured in superproject
>
> When merged to pu, it seems to break 7610.
It looks like the merge conflict resolution of the changes in
"submodule add: clean up duplicated code" with those from
"submodule add: always initialize .git/config entry" in the
jc/submodule-sync-no-auto-vivify branch dropped a variable change.
When I apply this on top of pu, all tests run fine:
------ 8< -----
@@ -253,11 +253,11 @@ Use -f if you really want to add it." &&
'') git checkout -f -q ;;
?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
esac
) || die "$(eval_gettext "Unable to checkout submodule '\$path'")"
fi
- git config submodule."$path".url "$url"
+ git config submodule."$path".url "$realrepo"
git add $force "$path" ||
die "$(eval_gettext "Failed to add submodule '\$path'")"
git config -f .gitmodules submodule."$path".path "$path" &&
next prev parent reply other threads:[~2011-07-02 18:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 23:26 What's cooking in git.git (Jun 2011, #05; Thu, 30) Junio C Hamano
2011-07-01 5:09 ` Elijah Newren
2011-07-01 21:39 ` Ævar Arnfjörð Bjarmason
2011-07-02 18:46 ` Jens Lehmann [this message]
2011-07-04 21:35 ` Junio C Hamano
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=4E0F67A3.2030001@web.de \
--to=jens.lehmann@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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