Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/73ce2e70651d0953a12ca8f25d5ba2830b046922 >--------------------------------------------------------------- commit 73ce2e70651d0953a12ca8f25d5ba2830b046922 Author: Geoffrey Mainland <[email protected]> Date: Sat Mar 17 09:36:15 2012 +0000 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. >--------------------------------------------------------------- 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 5a75327..b0e599d 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 = "" _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
