From: Pavel Roskin Date: Wed, 24 Aug 2005 21:58:42 +0000 (-0400) Subject: [PATCH] Fix "prefix" mixup in git-rev-list X-Git-Tag: v0.99.5~2^2~12 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d998a0895fc20c03007d8b2a74b78b37e1cdfaba;p=git.git [PATCH] Fix "prefix" mixup in git-rev-list Recent changes in git have broken cg-log. git-rev-list no longer prints "commit" in front of commit hashes. It turn out a local "prefix" variable in main() shadows a file-scoped "prefix" variable. The patch removed the local "prefix" variable since its value is never used (in the intended way, that is). The call to setup_git_directory() is kept since it has useful side effects. The file-scoped "prefix" variable is renamed to "commit_prefix" just in case someone reintroduces "prefix" to hold the return value of setup_git_directory(). Signed-off-by: Pavel Roskin Signed-off-by: Junio C Hamano --- diff --git a/rev-list.c b/rev-list.c index 3643adb63..2d97cdb64 100644 --- a/rev-list.c +++ b/rev-list.c @@ -33,7 +33,7 @@ static int blob_objects = 0; static int verbose_header = 0; static int show_parents = 0; static int hdr_termination = 0; -static const char *prefix = ""; +static const char *commit_prefix = ""; static unsigned long max_age = -1; static unsigned long min_age = -1; static int max_count = -1; @@ -48,14 +48,14 @@ static void show_commit(struct commit *commit) { commit->object.flags |= SHOWN; if (show_breaks) { - prefix = "| "; + commit_prefix = "| "; if (commit->object.flags & DISCONTINUITY) { - prefix = "^ "; + commit_prefix = "^ "; } else if (commit->object.flags & BOUNDARY) { - prefix = "= "; + commit_prefix = "= "; } } - printf("%s%s", prefix, sha1_to_hex(commit->object.sha1)); + printf("%s%s", commit_prefix, sha1_to_hex(commit->object.sha1)); if (show_parents) { struct commit_list *parents = commit->parents; while (parents) { @@ -481,9 +481,9 @@ static void handle_one_commit(struct commit *com, struct commit_list **lst) int main(int argc, char **argv) { struct commit_list *list = NULL; - const char *prefix = setup_git_directory(); int i, limited = 0; + setup_git_directory(); for (i = 1 ; i < argc; i++) { int flags; char *arg = argv[i]; @@ -511,9 +511,9 @@ int main(int argc, char **argv) verbose_header = 1; hdr_termination = '\n'; if (commit_format == CMIT_FMT_ONELINE) - prefix = ""; + commit_prefix = ""; else - prefix = "commit "; + commit_prefix = "commit "; continue; } if (!strncmp(arg, "--no-merges", 11)) {