* [PATCH 2/4] contrib/subtree: Allow stale .gitsubtree entries to be replaced
@ 2013-02-12 23:23 Paul Campbell
0 siblings, 0 replies; only message in thread
From: Paul Campbell @ 2013-02-12 23:23 UTC (permalink / raw
To: git; +Cc: David A. Greene, Michael Schubert
Should .gitsubtree have a <prefix> listed that doesn't exist on disk, allow
it to be replaced/updated by a git subtree add.
Ideally I would have aborted the operation if there was an existing entry
and required the user to edit the .gitsubtree file by hand, but that
behaviour broke a lot of the tests.
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
---
contrib/subtree/git-subtree.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 02aae30..4f21902 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -490,7 +490,13 @@ ensure_clean()
subtree_memorize()
{
- if [ $# -eq 1 ] ; then
+ if ( grep "^$dir " .gitsubtree ); then
+ # remove $dir from .gitsubtree - there's probably a clever way to
do this with sed
+ grep -v "^$dir " .gitsubtree > .gitsubtree.temp
+ rm .gitsubtree
+ mv .gitsubtree.temp .gitsubtree
+ fi
+ if [ $# -eq 1 ]; then
echo "$dir . $@" >> .gitsubtree
elif [ $# -eq 2 ]; then
echo "$dir $@" >> .gitsubtree
--
1.8.1.3.566.gaa39828
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-12 23:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-12 23:23 [PATCH 2/4] contrib/subtree: Allow stale .gitsubtree entries to be replaced Paul Campbell
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).