diff options
Diffstat (limited to 'scripts/lib/devtool/__init__.py')
-rw-r--r-- | scripts/lib/devtool/__init__.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 7b1ab1110d..c8c30202b1 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py | |||
@@ -183,11 +183,17 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base'): | |||
183 | if not os.path.exists(os.path.join(repodir, '.git')): | 183 | if not os.path.exists(os.path.join(repodir, '.git')): |
184 | bb.process.run('git init', cwd=repodir) | 184 | bb.process.run('git init', cwd=repodir) |
185 | bb.process.run('git add .', cwd=repodir) | 185 | bb.process.run('git add .', cwd=repodir) |
186 | if version: | 186 | commit_cmd = ['git', 'commit', '-q'] |
187 | stdout, _ = bb.process.run('git status --porcelain', cwd=repodir) | ||
188 | if not stdout: | ||
189 | commit_cmd.append('--allow-empty') | ||
190 | commitmsg = "Initial empty commit with no upstream sources" | ||
191 | elif version: | ||
187 | commitmsg = "Initial commit from upstream at version %s" % version | 192 | commitmsg = "Initial commit from upstream at version %s" % version |
188 | else: | 193 | else: |
189 | commitmsg = "Initial commit from upstream" | 194 | commitmsg = "Initial commit from upstream" |
190 | bb.process.run('git commit -q -m "%s"' % commitmsg, cwd=repodir) | 195 | commit_cmd += ['-m', commitmsg] |
196 | bb.process.run(commit_cmd, cwd=repodir) | ||
191 | 197 | ||
192 | bb.process.run('git checkout -b %s' % devbranch, cwd=repodir) | 198 | bb.process.run('git checkout -b %s' % devbranch, cwd=repodir) |
193 | bb.process.run('git tag -f %s' % basetag, cwd=repodir) | 199 | bb.process.run('git tag -f %s' % basetag, cwd=repodir) |