Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
pack-objects: remove redundent status information
author
Nicolas Pitre
<nico@cam.org>
Wed, 29 Nov 2006 22:15:48 +0000
(17:15 -0500)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 30 Nov 2006 03:06:53 +0000
(19:06 -0800)
The final 'nr_result' and 'written' values must always be the same
otherwise we're in deep trouble. So let's remove a redundent report.
And for paranoia sake let's make sure those two variables are actually
equal after all objects are written (one never knows).
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-pack-objects.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
03f99c0
)
diff --git
a/builtin-pack-objects.c
b/builtin-pack-objects.c
index 753bcd57b0084e7d3fa748f6a0fcef37a2ae8f3b..a2dc7d1d9d39436e8e5266d1d4bb693b06a54b17 100644
(file)
--- a/
builtin-pack-objects.c
+++ b/
builtin-pack-objects.c
@@
-514,6
+514,8
@@
static void write_pack_file(void)
if (do_progress)
fputc('\n', stderr);
done:
if (do_progress)
fputc('\n', stderr);
done:
+ if (written != nr_result)
+ die("wrote %d objects while expecting %d", written, nr_result);
sha1close(f, pack_file_sha1, 1);
}
sha1close(f, pack_file_sha1, 1);
}
@@
-1662,7
+1664,7
@@
int cmd_pack_objects(int argc, const char **argv, const char *prefix)
}
}
if (progress)
}
}
if (progress)
- fprintf(stderr, "Total %d
, written %d
(delta %d), reused %d (delta %d)\n",
-
nr_result,
written, written_delta, reused, reused_delta);
+ fprintf(stderr, "Total %d (delta %d), reused %d (delta %d)\n",
+ written, written_delta, reused, reused_delta);
return 0;
}
return 0;
}