diff options
| author | Geoffrey Mainland <gmainlan@microsoft.com> | 2012-03-17 09:36:15 +0000 |
|---|---|---|
| committer | Geoffrey Mainland <gmainlan@microsoft.com> | 2012-03-17 09:36:15 +0000 |
| commit | 73ce2e70651d0953a12ca8f25d5ba2830b046922 (patch) | |
| tree | 0ba94dd772fa51d1ed14e2d97167d20bdf079c3e /utils/fingerprint | |
| parent | 0936621a72da0e8811d351be6f03edd5d724f711 (diff) | |
| download | haskell-73ce2e70651d0953a12ca8f25d5ba2830b046922.tar.gz | |
Fix fingerprints for merge commits.
fingerprint.py executes `git log HEAD^.. --pretty=oneline` to get the hash of
the HEAD commit for each git repo, but didn't properly handle the case where the
HEAD commit is a merge. In that case, more than one hash will be output. Now
fingerprint.py executes `git log -1 --pretty=oneline` instead.
Diffstat (limited to 'utils/fingerprint')
| -rwxr-xr-x | utils/fingerprint/fingerprint.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/fingerprint/fingerprint.py b/utils/fingerprint/fingerprint.py index 5a753279e6..b0e599d03b 100755 --- a/utils/fingerprint/fingerprint.py +++ b/utils/fingerprint/fingerprint.py @@ -55,7 +55,7 @@ def fingerprint(source=None): `sync-all` command will be run to get the current fingerprint. """ if source is None: - sync_all = ["./sync-all", "log", "HEAD^..", "--pretty=oneline"] + sync_all = ["./sync-all", "log", "-1", "--pretty=oneline"] source = Popen(sync_all, stdout=PIPE).stdout lib = "" |