diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2016-02-29 12:59:09 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-02 22:39:05 +0000 |
| commit | fd9d08b8ba512151615a03fda61a103760a0683c (patch) | |
| tree | dd35dfe2957ac3f4e2cb42cb55d47ea1a431502e | |
| parent | b7ac987274f7aeaeacc217488cf4fe639de81b76 (diff) | |
| download | openembedded-core-fd9d08b8ba512151615a03fda61a103760a0683c.tar.gz openembedded-core-fd9d08b8ba512151615a03fda61a103760a0683c.tar.bz2 openembedded-core-fd9d08b8ba512151615a03fda61a103760a0683c.zip | |
combo-layer: handle empty commits during "init --history"
When importing the components during the "combo-layer init" with full
history and relocation into a destination directory, components with
empty commits were not handled because the "mv" command was invoked
with just one parameter.
Replacing that with a find/xargs pair avoids the problem and should
also fix the handling of filenames with special characters (in
particular spaces).
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index f028098cbb..09a53a27e4 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -380,7 +380,7 @@ tail -c +18 $tmpname | head -c -4 if not parent: parent = '.' # May run outside of the current directory, so do not assume that .git exists. - filter_branch.extend(['--tree-filter', 'mkdir -p .git/tmptree && mv $(ls -1 -a | grep -v -e ^.git$ -e ^.$ -e ^..$) .git/tmptree && mkdir -p %s && mv .git/tmptree %s' % (parent, dest_dir)]) + filter_branch.extend(['--tree-filter', 'mkdir -p .git/tmptree && find . -mindepth 1 -maxdepth 1 ! -name .git -print0 | xargs -0 -I SOURCE mv SOURCE .git/tmptree && mkdir -p %s && mv .git/tmptree %s' % (parent, dest_dir)]) filter_branch.append('HEAD') runcmd(filter_branch) runcmd('git update-ref -d refs/original/refs/heads/%s' % name) |