This variable points at the element we are currently looking at, and
does not have anything to do with the current time which the name
"now" implies.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
sha1_name.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 4cbca34..5224f39 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -93,11 +93,11 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
last = num;
while (first < last) {
uint32_t mid = (first + last) / 2;
- const unsigned char *now;
+ const unsigned char *current;
int cmp;
- now = nth_packed_object_sha1(p, mid);
- cmp = hashcmp(match, now);
+ current = nth_packed_object_sha1(p, mid);
+ cmp = hashcmp(match, current);
if (!cmp) {
first = mid;
break;
@@ -109,17 +109,17 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
last = mid;
}
if (first < num) {
- const unsigned char *now, *next;
- now = nth_packed_object_sha1(p, first);
- if (match_sha(len, match, now)) {
+ const unsigned char *current, *next;
+ current = nth_packed_object_sha1(p, first);
+ if (match_sha(len, match, current)) {
next = nth_packed_object_sha1(p, first+1);
if (!next|| !match_sha(len, match, next)) {
/* unique within this pack */
if (!found) {
- found_sha1 = now;
+ found_sha1 = current;
found++;
}
- else if (hashcmp(found_sha1, now)) {
+ else if (hashcmp(found_sha1, current)) {
found = 2;
break;
}
--
1.7.11
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html