android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

superproject: Pass branch to git ls-tree.

Browse Source 
Tested the code with the following commands.

$ ./run_tests -v

Bug: [google internal] b/179702819
Bug: https://crbug.com/gerrit/13709
Bug: https://crbug.com/gerrit/13707
Tested-by: Raman Tenneti <rtenneti@google.com>
Change-Id: I7d2b609ac2f927c94701757aa1502ba236afe7c0
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/296342
Reviewed-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Raman Tenneti 2021-02-08 13:27:41 -08:00
parent 8d43dea6ea
commit ce64e3d47b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git_superproject.py
View File

@ -112,11 +112,14 @@ class Superproject(object):
return False return False
return True return True
def _LsTree(self): def _LsTree(self, branch='HEAD'):
"""Returns the data from 'git ls-tree -r HEAD'. """Returns the data from 'git ls-tree -r <branch>'.
Works only in git repositories. Works only in git repositories.
Args:
branch: The branchname to be passed as argument to git ls-tree.
Returns: Returns:
data: data returned from 'git ls-tree -r HEAD' instead of None. data: data returned from 'git ls-tree -r HEAD' instead of None.
""" """
@ -125,7 +128,8 @@ class Superproject(object):
file=sys.stderr) file=sys.stderr)
return None return None
data = None data = None
cmd = ['ls-tree', '-z', '-r', 'HEAD'] cmd = ['ls-tree', '-z', '-r', branch]
p = GitCommand(None, p = GitCommand(None,
cmd, cmd,
cwd=self._work_git, cwd=self._work_git,
@ -165,7 +169,7 @@ class Superproject(object):
if not self._Clone(url, branch): if not self._Clone(url, branch):
raise GitError('git clone failed for url: %s' % url) raise GitError('git clone failed for url: %s' % url)
data = self._LsTree() data = self._LsTree(branch)
if not data: if not data:
raise GitError('git ls-tree failed for url: %s' % url) raise GitError('git ls-tree failed for url: %s' % url)