diff --git a/roll_dep.py b/roll_dep.py
index d34d467ff..b857f652a 100755
--- a/roll_dep.py
+++ b/roll_dep.py
@@ -99,13 +99,15 @@ def gclient(args):
 def generate_commit_message(
     full_dir, dependency, head, roll_to, no_log, log_limit):
   """Creates the commit message for this specific roll."""
-  commit_range = '%s..%s' % (head[:9], roll_to[:9])
+  commit_range = '%s..%s' % (head, roll_to)
+  commit_range_for_header = '%s..%s' % (head[:9], roll_to[:9])
   upstream_url = check_output(
       ['git', 'config', 'remote.origin.url'], cwd=full_dir).strip()
   log_url = get_log_url(upstream_url, head, roll_to)
   cmd = ['git', 'log', commit_range, '--date=short', '--no-merges']
   logs = check_output(
-      cmd + ['--format=%ad %ae %s'], # Args with '=' are automatically quoted.
+      # Args with '=' are automatically quoted.
+      cmd + ['--format=%ad %ae %s', '--'],
       cwd=full_dir).rstrip()
   logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$', r'\1\2', logs)
   lines = logs.splitlines()
@@ -116,7 +118,7 @@ def generate_commit_message(
   rolls = nb_commits - len(cleaned_lines)
   header = 'Roll %s/ %s (%d commit%s%s)\n\n' % (
       dependency,
-      commit_range,
+      commit_range_for_header,
       nb_commits,
       's' if nb_commits > 1 else '',
       ('; %s trivial rolls' % rolls) if rolls else '')