Re: What's cooking in git.git (Jun 2011, #05; Thu, 30)

From: Jens Lehmann <jens.lehmann@web.de>
Date: Jul 2, 2011, 18:46 UTC
Message-ID: <4E0F67A3.2030001@web.de>
In-Reply-To: <7viprmq4sy.fsf@alter.siamese.dyndns.org>

Am 01.07.2011 01:26, schrieb Junio C Hamano:

Show 6 quoted lines

> * 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" &&