Commit ad6a1b6 Exclude the commit shared between the branches from the diff list

1 file Authored and Committed by pingou a month ago
Exclude the commit shared between the branches from the diff list

    
 1 @@ -303,13 +303,14 @@
 2                       except StopIteration:
 3                           pass
 4                   try:
 5 -                     com = branch_walker.next()
 6 -                     branch_commits.append(com.hex)
 7 +                     branch_commit = branch_walker.next()
 8                   except StopIteration:
 9 -                     break
10 +                     branch_commit = None
11   
12 -                 if main_commits.intersection(set(branch_commits)):
13 +                 if main_commits.intersection(set(
14 +                         branch_commits + [branch_commit.hex])):
15                       break
16 +                 branch_commits.append(branch_commit.hex)
17   
18               if branch_commits:
19                   branches[branchname] = branch_commits