Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH 7/7] mergetool--lib: Improve show_tool_help() output

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:54

John Keeping [off-list ref] writes:
quoted
+		tool="$(basename "$i")"
Quotes are unnecessary here.
Yeah, the outer quotes aren't needed; the inner ones are.
quoted
+		if test "$tool" = "defaults"
+		then
+			continue
+		elif merge_mode && ! can_merge
+		then
+			continue
+		elif diff_mode && ! can_diff
+		then
+			continue
+		fi
Would this be better as:

    test "$tool" = "defaults" && continue

    can_merge || ! merge_mode || continue
    can_diff || ! diff_mode || continue

or is that a bit too concise?
It is beyond "too concise"; it is unreadable, and more importantly,
the latter two lines are illogical (why do you even ask if it can be
used for merging, before asking merge_mode to see if the answer to
that question matters to you?)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help