mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-21 09:42:22 +02:00
Code

Merge branch 'master' into next

Browse Source 
* master:
  fix warning from pack-objects.c
  Merge branches 'jc/rev-list' and 'jc/pack-thin'
  gitview: Fix the graph display .
This commit is contained in:
Junio C Hamano 2006-02-24 23:47:48 -08:00
commit ab57c8dd2a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/gitview/gitview
View File

@ -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]

2
pack-objects.c
View File

@ -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 */