Merge branch 'rs/pack-objects-pbase-cleanup'

gitster · gitster · commit e57856502d93 · 2017-08-11T13:27:00.000-07:00
Code clean-up.

* rs/pack-objects-pbase-cleanup:
  pack-objects: remove unnecessary NULL check
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -1289,7 +1289,7 @@ static int done_pbase_path_pos(unsigned hash)
 
 static int check_pbase_path(unsigned hash)
 {
-	int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);
+	int pos = done_pbase_path_pos(hash);
 	if (0 <= pos)
 		return 1;
 	pos = -pos - 1;

Original file line number	Diff line number	Diff line change
`@@ -1289,7 +1289,7 @@ static int done_pbase_path_pos(unsigned hash)`
`1289`	`1289`
`1290`	`1290`	`static int check_pbase_path(unsigned hash)`
`1291`	`1291`	`{`
`1292`		`- int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);`
	`1292`	`+ int pos = done_pbase_path_pos(hash);`
`1293`	`1293`	`if (0 <= pos)`
`1294`	`1294`	`return 1;`
`1295`	`1295`	`pos = -pos - 1;`