diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-17 02:47:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-17 02:47:26 +0300 |
| commit | 43c1b6efb86bc68220d28c90b9f6f2d9e278d390 (patch) | |
| tree | 6e003086dce687b59f33fca45e7bdcc98d42cd0f /builtin | |
| parent | 4e530c5049a305f82c3e4768b26e6a689aa3c84e (diff) | |
| parent | 3a4d67692b5a80213ca47a603fa5505a5990cc87 (diff) | |
Merge branch 'lt/rename-no-extra-copy-detection' into maint
* lt/rename-no-extra-copy-detection:
diffcore-rename: improve estimate_similarity() heuristics
diffcore-rename: properly honor the difference between -M and -C
for_each_hash: allow passing a 'void *data' pointer to callback
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/describe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 342129fdbd..3ba26dc819 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -63,7 +63,7 @@ static inline struct commit_name *find_commit_name(const unsigned char *peeled) return n; } -static int set_util(void *chain) +static int set_util(void *chain, void *data) { struct commit_name *n; for (n = chain; n; n = n->next) { @@ -289,7 +289,7 @@ static void describe(const char *arg, int last_one) fprintf(stderr, "searching to describe %s\n", arg); if (!have_util) { - for_each_hash(&names, set_util); + for_each_hash(&names, set_util, NULL); have_util = 1; } |