From 0b5b409acca23e9b08c84f5ad531e287601448a2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 15 Oct 2014 02:27:00 -0600 Subject: [PATCH] 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 --- tools/buildman/control.py | 2 +- tools/patman/patchstream.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 8b8c826002..96ba2d940e 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 d630157f8f..da0488337b 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: -- 2.25.1