Always print the interesting ranges even if the current
commit does not change any line of it.
Signed-off-by: Bo Yang <struggleyb.nku@xxxxxxxxx>
---
builtin/log.c | 3 +++
line.c | 11 +++++++++--
revision.h | 3 ++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 87d6b2f..a0918ef 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -85,6 +85,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
{
int i;
int decoration_given = 0;
+ static int always_print = 0;
struct userformat_want w;
const char *path = NULL, *pathspec = NULL;
static struct diff_line_range *range = NULL;
@@ -92,6 +93,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
static struct line_opt_callback_data line_cb = {&range, &ctx, NULL};
static const struct option options[] = {
OPT_CALLBACK('L', NULL, &line_cb, "n,m", "Process only line range n,m, counting from 1", log_line_range_callback),
+ OPT_BOOLEAN(0, "always-print", &always_print, "Always print the interesting range even if the current commit does not change any line of it"),
OPT_END()
};
static const struct option null_options[] = {
@@ -244,6 +246,7 @@ parse_done2:
/* Test whether line level history is asked for */
if (range && range->nr > 0) {
setup_line(rev, range);
+ rev->always_print = always_print;
}
}
diff --git a/line.c b/line.c
index 46d0937..655fa71 100644
--- a/line.c
+++ b/line.c
@@ -1067,6 +1067,13 @@ static void diff_flush_filepair(struct rev_info *rev, struct diff_line_range *ra
* no sensible rang->pair since there is no diff run.
*/
if (one == NULL) {
+ if (rev->always_print) {
+ chunk.two = two->data;
+ chunk.two_end = two->data + two->size;
+ chunk.ltwo = 1;
+ chunk.range = range;
+ diff_flush_chunks(&rev->diffopt, &chunk);
+ }
return;
}
@@ -1177,7 +1184,7 @@ static void line_log_flush(struct rev_info *rev, struct commit *c)
return flush_nontrivial_merge(rev, nontrivial);
while (range) {
- if (range->diff)
+ if (range->diff || (range->nr && rev->always_print))
diff_flush_filepair(rev, range);
range = range->next;
}
@@ -1211,7 +1218,7 @@ int cmd_line_log_walk(struct rev_info *rev)
assign_parents_range(rev, commit);
}
- if (commit->object.flags & NEED_PRINT) {
+ if (commit->object.flags & NEED_PRINT || rev->always_print) {
line_log_flush(rev, commit);
}
diff --git a/revision.h b/revision.h
index 2bc3750..02ab14c 100644
--- a/revision.h
+++ b/revision.h
@@ -71,7 +71,8 @@ struct rev_info {
bisect:1,
ancestry_path:1,
first_parent_only:1,
- line:1;
+ line:1,
+ always_print:1;
/* Diff flags */
unsigned int diff:1,
--
1.7.1.577.g36cf0.dirty
--
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