{"thread":{"id":"33121","subject":"[PATCH 02/19] Add from-submodule. Conflicts: .gitignore contrib/subtree/git-subtree.sh test.sh","startedAt":"2013-03-09T19:20:58Z","lastAt":"2013-03-09T19:20:58Z","messageCount":1,"participants":["Paul Campbell"],"isPatch":true,"patchVersion":1,"patchTotal":19},"messages":[{"id":"210908","messageId":"CALeLG_=Ch2eTBF59UKTCr1vCpW=asbAdXBs+uYP+gtv=w4H6AA@mail.gmail.com","threadId":"33121","inReplyTo":null,"subject":"[PATCH 02/19] Add from-submodule. Conflicts: .gitignore contrib/subtree/git-subtree.sh test.sh","fromName":"Paul Campbell","fromEmail":"pcampbell@kemitix.net","sentAt":"2013-03-09T19:20:58Z","receivedAt":"2013-03-09T19:20:58Z","isPatch":true,"sender":{"key":"pcampbell@kemitix.net","avatar":"https://gravatar.com/avatar/57584e05501b694929004e43fcd7308f4ad64df2eb0474cd8c7e5f93662bb0f1?d=mp&s=160"},"body":">From 718c99d167255b28830b6f684d6e6e184fba0f7c Mon Sep 17 00:00:00 2001\nFrom: Paul Campbell <pcampbell@kemitix.net>\nDate: Sat, 9 Mar 2013 18:30:20 +0000\nSubject: [PATCH 02/19] Add from-submodule. Conflicts: \t.gitignore\n contrib/subtree/git-subtree.sh \ttest.sh\n\nOriginal-Author: Peter Jaros <pjaros@pivotallabs.com>\nConflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>\n---\n contrib/subtree/git-subtree.sh | 30 +++++++++++++++++++++++++++++-\n 1 file changed, 29 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh\nindex 8a23f58..caf4988 100755\n--- a/contrib/subtree/git-subtree.sh\n+++ b/contrib/subtree/git-subtree.sh\n@@ -14,6 +14,7 @@ git subtree merge --prefix=<prefix> <commit>\n git subtree pull  --prefix=<prefix> <repository> <refspec...>\n git subtree push  --prefix=<prefix> <repository> <refspec...>\n git subtree split --prefix=<prefix> <commit...>\n+git subtree from-submodule --prefix=<prefix>\n --\n h,help        show the help\n q             quiet\n@@ -101,7 +102,7 @@ done\n command=\"$1\"\n shift\n case \"$command\" in\n-\tadd|merge|pull) default= ;;\n+\tadd|merge|pull|from-submodule) default= ;;\n \tsplit|push) default=\"--default HEAD\" ;;\n \t*) die \"Unknown command '$command'\" ;;\n esac\n@@ -721,4 +722,31 @@ cmd_push()\n \tfi\n }\n\n+cmd_from-submodule()\n+{\n+\tensure_clean\n+\n+\tlocal submodule_sha=$(git submodule status $prefix | cut -d ' ' -f 2)\n+\n+\t# Remove references to submodule.\n+\tgit config --remove-section submodule.$prefix\n+\tgit config --file .gitmodules --remove-section submodule.$prefix\n+\tgit add .gitmodules\n+\n+\t# Move submodule aside.\n+\tlocal tmp_repo=\"$(mktemp -d /tmp/git-subtree.XXXXX)\"\n+\trm -r $tmp_repo\n+\tmv $prefix $tmp_repo\n+\tgit rm $prefix\n+\n+\t# Commit changes.\n+\tgit commit -m \"Remove '$prefix/' submodule\"\n+\n+\t# subtree add from submodule repo.\n+\tcmd_add_repository $tmp_repo HEAD\n+\n+\t# Remove submodule repo.\n+\trm -rf $tmp_repo\n+}\n+\n \"cmd_$command\" \"$@\"\n-- \n1.8.2.rc1\n\n\n-- \nPaul [W] Campbell\n"}]}