- # to overwrite earlier ones.
- series.allow_overwrite = True
- series = patchstream.GetMetaDataForList(range_expr, options.git_dir, None,
- series)
+ # to overwrite earlier ones by setting allow_overwrite=True
+ if options.branch:
+ if count == -1:
+ if has_range:
+ range_expr = options.branch
+ else:
+ range_expr = gitutil.GetRangeInBranch(options.git_dir,
+ options.branch)
+ upstream_commit = gitutil.GetUpstream(options.git_dir,
+ options.branch)
+ series = patchstream.GetMetaDataForList(upstream_commit,
+ options.git_dir, 1, series=None, allow_overwrite=True)
+
+ series = patchstream.GetMetaDataForList(range_expr,
+ options.git_dir, None, series, allow_overwrite=True)
+ else:
+ # Honour the count
+ series = patchstream.GetMetaDataForList(options.branch,
+ options.git_dir, count, series=None, allow_overwrite=True)
+ else:
+ series = None
+ options.verbose = True
+ if not options.summary:
+ options.show_errors = True