mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
"blame -c" should be compatible with "annotate"
There is no reason to have a separate variable cmd_is_annotate; OUTPUT_ANNOTATE_COMPAT option is supposed to produce the compatibility output, and we should produce the same output even when the command was not invoked as "annotate" but as "blame -c". Noticed by Pasky. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f88d225feb
commit
7ceacdffc5
|
@ -38,7 +38,6 @@ static int show_root;
|
|||
static int reverse;
|
||||
static int blank_boundary;
|
||||
static int incremental;
|
||||
static int cmd_is_annotate;
|
||||
static int xdl_opts = XDF_NEED_MINIMAL;
|
||||
static struct string_list mailmap;
|
||||
|
||||
|
@ -1686,7 +1685,7 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt)
|
|||
if (suspect->commit->object.flags & UNINTERESTING) {
|
||||
if (blank_boundary)
|
||||
memset(hex, ' ', length);
|
||||
else if (!cmd_is_annotate) {
|
||||
else if (!(opt & OUTPUT_ANNOTATE_COMPAT)) {
|
||||
length--;
|
||||
putchar('^');
|
||||
}
|
||||
|
@ -2317,8 +2316,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
|
|||
};
|
||||
|
||||
struct parse_opt_ctx_t ctx;
|
||||
|
||||
cmd_is_annotate = !strcmp(argv[0], "annotate");
|
||||
int cmd_is_annotate = !strcmp(argv[0], "annotate");
|
||||
|
||||
git_config(git_blame_config, NULL);
|
||||
init_revisions(&revs, NULL);
|
||||
|
@ -2346,6 +2344,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
|
|||
parse_done:
|
||||
argc = parse_options_end(&ctx);
|
||||
|
||||
if (cmd_is_annotate)
|
||||
output_option |= OUTPUT_ANNOTATE_COMPAT;
|
||||
|
||||
if (DIFF_OPT_TST(&revs.diffopt, FIND_COPIES_HARDER))
|
||||
opt |= (PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE |
|
||||
PICKAXE_BLAME_COPY_HARDER);
|
||||
|
|
|
@ -488,4 +488,17 @@ test_expect_success 'cvs co -c (shows module database)' '
|
|||
! grep -v "^master[ ]\+master$" < out
|
||||
'
|
||||
|
||||
#------------
|
||||
# CVS ANNOTATE
|
||||
#------------
|
||||
|
||||
cd "$WORKDIR"
|
||||
test_expect_success 'cvs annotate' '
|
||||
cd cvswork &&
|
||||
GIT_CONFIG="$git_config" cvs annotate merge >../out &&
|
||||
sed -e "s/ .*//" ../out >../actual &&
|
||||
for i in 3 1 1 1 1 1 1 1 2 4; do echo 1.$i; done >../expect &&
|
||||
test_cmp ../expect ../actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue