Merge branch 'master' into next

* master: fix warning from pack-objects.c Merge branches 'jc/rev-list' and 'jc/pack-thin' gitview: Fix the graph display .
git-mirror · Feb 25, 2006 · ab57c8d · ab57c8d
2 parents d55e0ff + 8fcf1ad
commit ab57c8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
@@ -938,8 +938,10 @@ class GitView:
 	def draw_incomplete_line(self, sha1, node_pos, out_line, in_line, index):
 		for idx, pos in enumerate(self.incomplete_line[sha1]):
 			if(pos == node_pos):
-				out_line.append((pos,
-					pos+0.5, self.colours[sha1]))
+				#remove the straight line and add a slash
+				if ((pos, pos, self.colours[sha1]) in out_line):
+					out_line.remove((pos, pos, self.colours[sha1]))
+				out_line.append((pos, pos+0.5, self.colours[sha1]))
 				self.incomplete_line[sha1][idx] = pos = pos+0.5
 			try:
 				next_commit = self.commits[index+1]

diff --git a/pack-objects.c b/pack-objects.c
@@ -99,7 +99,7 @@ static int reused_delta = 0;
 
 static int pack_revindex_ix(struct packed_git *p)
 {
-	unsigned int ui = (unsigned int) p;
+	unsigned long ui = (unsigned long)(long)p;
 	int i;
 
 	ui = ui ^ (ui >> 16); /* defeat structure alignment */