diff options
| author | Simon Glass <sjg@chromium.org> | 2014-10-15 02:27:00 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-11-26 20:25:39 -0700 |
| commit | 0b5b409acca23e9b08c84f5ad531e287601448a2 (patch) | |
| tree | 5ce956b637f943bb6ee8429dce624c45b6f91be9 /tools | |
| parent | ce267335c31e95d69d42abf886ce7f3df1b5b2a4 (diff) | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildman/control.py | 2 | ||||
| -rw-r--r-- | 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 8b8c826002f..96ba2d940ef 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 d630157f8f7..da0488337b2 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: |