Re: [PATCH][GSoC] revision: forbid --graph and --no-walk usage

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH][GSoC] revision: forbid --graph and --no-walk usage

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:04:00

Akshay Aurora [off-list ref] writes:
quoted hunk
Signed-off-by: Akshay Aurora <redacted>
---
This is my first patch for a GSoC Microproject, would be great to have your feedback.

 revision.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/revision.c b/revision.c
index bd027bc..d578652 100644
--- a/revision.c
+++ b/revision.c
@@ -2248,7 +2248,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	 */
 	if (revs->reverse && revs->graph)
 		die("cannot combine --reverse with --graph");
-
+	if (revs->no_walk && revs->graph)
+		die("cannot combine --no-walk with --graph");
 	if (revs->reflog_info && revs->graph)
 		die("cannot combine --walk-reflogs with --graph");
 	if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
Needs a new test to make sure "log --no-walk --graph" is rejected,
and also you need to make sure all other existing tests that used to
pass before this change still pass.

Re: [PATCH][GSoC] revision: forbid --graph and --no-walk usage

From: Akshay Aurora <hidden>
Date: 2016-06-15 23:04:00

Thanks Junio. Working on v2 for this patch.

On Sat, Mar 7, 2015 at 12:00 AM, Junio C Hamano [off-list ref] wrote:
Akshay Aurora [off-list ref] writes:
quoted
Signed-off-by: Akshay Aurora <redacted>
---
This is my first patch for a GSoC Microproject, would be great to have your feedback.

 revision.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/revision.c b/revision.c
index bd027bc..d578652 100644
--- a/revision.c
+++ b/revision.c
@@ -2248,7 +2248,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
       */
      if (revs->reverse && revs->graph)
              die("cannot combine --reverse with --graph");
-
+     if (revs->no_walk && revs->graph)
+             die("cannot combine --no-walk with --graph");
      if (revs->reflog_info && revs->graph)
              die("cannot combine --walk-reflogs with --graph");
      if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
Needs a new test to make sure "log --no-walk --graph" is rejected,
and also you need to make sure all other existing tests that used to
pass before this change still pass.


-- 
- Akshay Aurora
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help