summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-15 02:27:00 -0600
committerSimon Glass <sjg@chromium.org>2014-11-03 14:12:39 -0700
commit1ddda1b321a102b31bcddc0b1cc23fe3449533c6 (patch)
tree3f7b6d1c69162eaded9b2e2074b3dc4dbe3ec1da
parent58d818f19f349fc17a3907b2be62a6d2d2dc242b (diff)
downloadu-boot-imx-1ddda1b321a102b31bcddc0b1cc23fe3449533c6.zip
u-boot-imx-1ddda1b321a102b31bcddc0b1cc23fe3449533c6.tar.gz
u-boot-imx-1ddda1b321a102b31bcddc0b1cc23fe3449533c6.tar.bz2
patman: Use the full commit hash for 'git checkout'
Even with the initial 8 characeters of the hash we will sometimes get a collision. Use the full hash. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--tools/buildman/control.py2
-rw-r--r--tools/patman/patchstream.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 6a4de36..fb79a1e 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -70,7 +70,7 @@ def ShowActions(series, why_selected, boards_selected, builder, options):
if commits:
for upto in range(0, len(series.commits), options.step):
commit = series.commits[upto]
- print ' ', col.Color(col.YELLOW, commit.hash, bright=False),
+ print ' ', col.Color(col.YELLOW, commit.hash[:8], bright=False),
print commit.subject
print
for arg in why_selected:
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index d630157..da04883 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -248,8 +248,7 @@ class PatchStream:
# Detect the start of a new commit
elif commit_match:
self.CloseCommit()
- # TODO: We should store the whole hash, and just display a subset
- self.commit = commit.Commit(commit_match.group(1)[:8])
+ self.commit = commit.Commit(commit_match.group(1))
# Detect tags in the commit message
elif tag_match: