Re: [PATCH 01/12] Generate unique ID for submodules created using "git submodule add"

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mar 27, 2010, 09:44 UTC
Message-ID: <20100327094427.GA30216@progeny.tock>
In-Reply-To: <1269617140-7827-2-git-send-email-peter@pcc.me.uk>

Peter Collingbourne wrote:

Show 6 quoted lines

> This patch causes "git submodule add" to generate a unique ID for
> the submodule which is used as its name.  The ID is generated by
> computing the SHA1 hash of the pid, date and initial path.
> 
> The purpose of this patch is to avoid name conflicts which may
> arise due to the ability to rename submodules.

I assume this is related to Pasky’s patch “git submodule add: Fix naming clash handling” [1]

	This patch fixes git submodule add behaviour when we add submodule
	living at a same path as logical name of existing submodule. This
	can happen e.g. in case the user git mv's the previous submodule away
	and then git submodule add's another under the same name.
	
	A test-case is obviously included.
	
	This is not completely satisfactory since .git/config cross-commit
	conflicts can still occur. A question is whether this is worth
	handling, maybe it would be worth adding some kind of randomization
	of the autogenerated submodule name, e.g. appending $$ or a timestamp.

The suggestion of _appending_ some nonsense to a submodule name sounds much more palatable to me than _replacing_ the submodule name with nonsense. YMMV, of course.

Regards, Jonathan

[1] submitted twice: once as part of the series you pointed to and again in the re-roll at http://thread.gmane.org/gmane.comp.version-control.git/95763/focus=95769