name-rev: Fix non-shortest description
Uwe Kleine-König noticed that under certain circumstances, name-rev picked a non-optimal tag. Jeff King analyzed that name-rev only takes into account the number of merge traversals, and then the _last_ number in the description. As an easy way to fix it, use a weighting factor for merge traversals: A merge traversal is now made 65535 times more expensive than a first-parent traversal. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Aug 27, 2007 at 12:37 UTC
ac076c29ae8d57b72abe27f573061ea7b2eeed57
1 file changed
+11
-10
builtin-name-rev.c
+11
-10
@@ -11,14 +11,17 @@ static const char name_rev_usage[] =
11
12
typedef struct rev_name {
13
const char *tip_name;
14
- int merge_traversals;
14
int generation;
15
+ int distance;
16
} rev_name;
17
18
static long cutoff = LONG_MAX;
19
20
+/* How many generations are maximally preferred over _one_ merge traversal? */
21
+#define MERGE_TRAVERSAL_WEIGHT 65535
22
+
23
static void name_rev(struct commit *commit,
21
- const char *tip_name, int merge_traversals, int generation,
24
+ const char *tip_name, int generation, int distance,
25
int deref)
26
{
27
struct rev_name *name = (struct rev_name *)commit->util;
@@ -45,13 +48,11 @@ static void name_rev(struct commit *commit,
48
name = xmalloc(sizeof(rev_name));
49
commit->util = name;
50
goto copy_data;
48
- } else if (name->merge_traversals > merge_traversals ||
49
- (name->merge_traversals == merge_traversals &&
50
- name->generation > generation)) {
51
+ } else if (name->distance > distance) {
52
copy_data:
53
name->tip_name = tip_name;
53
- name->merge_traversals = merge_traversals;
54
name->generation = generation;
55
+ name->distance = distance;
56
} else
57
return;
58
@@ -74,11 +75,11 @@ copy_data:
75
sprintf(new_name, "%.*s^%d", len, tip_name,
76
parent_number);
77
77
- name_rev(parents->item, new_name,
78
- merge_traversals + 1 , 0, 0);
78
+ name_rev(parents->item, new_name, 0,
79
+ distance + MERGE_TRAVERSAL_WEIGHT, 0);
80
} else {
80
- name_rev(parents->item, tip_name, merge_traversals,
81
- generation + 1, 0);
81
+ name_rev(parents->item, tip_name, generation + 1,
82
+ distance + 1, 0);
83
}
84
}
85
}