mergetool--lib: simplify command expressions
Update variable assignments to always use $(command "$arg") in their RHS instead of "$(command "$arg")" as the latter is harder to read. Make get_merge_tool_cmd() simpler by avoiding "echo" and $(command) substitutions completely. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Jan 27, 2013 at 16:52 UTC
80ff2b68f28193af70d4c0bb9d363531eb1c3d23
1 file changed
+15
-23
git-mergetool--lib.sh
+15
-23
@@ -32,17 +32,10 @@ check_unchanged () {
32
fi
33
}
34
35
-valid_tool_config () {
36
- if test -n "$(get_merge_tool_cmd "$1")"
37
- then
38
- return 0
39
- else
40
- return 1
41
- fi
42
-}
43
-
35
valid_tool () {
45
- setup_tool "$1" || valid_tool_config "$1"
36
+ setup_tool "$1" && return 0
37
+ cmd=$(get_merge_tool_cmd "$1")
38
+ test -n "$cmd"
39
}
40
41
setup_tool () {
@@ -96,14 +89,13 @@ setup_tool () {
89
}
90
91
get_merge_tool_cmd () {
99
- # Prints the custom command for a merge tool
92
merge_tool="$1"
93
if diff_mode
94
then
103
- echo "$(git config difftool.$merge_tool.cmd ||
104
- git config mergetool.$merge_tool.cmd)"
95
+ git config "difftool.$merge_tool.cmd" ||
96
+ git config "mergetool.$merge_tool.cmd"
97
else
106
- echo "$(git config mergetool.$merge_tool.cmd)"
98
+ git config "mergetool.$merge_tool.cmd"
99
fi
100
}
101
@@ -114,7 +106,7 @@ run_merge_tool () {
106
GIT_PREFIX=${GIT_PREFIX:-.}
107
export GIT_PREFIX
108
117
- merge_tool_path="$(get_merge_tool_path "$1")" || exit
109
+ merge_tool_path=$(get_merge_tool_path "$1") || exit
110
base_present="$2"
111
status=0
112
@@ -145,7 +137,7 @@ run_merge_tool () {
137
138
# Run a either a configured or built-in diff tool
139
run_diff_cmd () {
148
- merge_tool_cmd="$(get_merge_tool_cmd "$1")"
140
+ merge_tool_cmd=$(get_merge_tool_cmd "$1")
141
if test -n "$merge_tool_cmd"
142
then
143
( eval $merge_tool_cmd )
@@ -158,11 +150,11 @@ run_diff_cmd () {
150
151
# Run a either a configured or built-in merge tool
152
run_merge_cmd () {
161
- merge_tool_cmd="$(get_merge_tool_cmd "$1")"
153
+ merge_tool_cmd=$(get_merge_tool_cmd "$1")
154
if test -n "$merge_tool_cmd"
155
then
164
- trust_exit_code="$(git config --bool \
165
- mergetool."$1".trustExitCode || echo false)"
156
+ trust_exit_code=$(git config --bool \
157
+ "mergetool.$1.trustExitCode" || echo false)
158
if test "$trust_exit_code" = "false"
159
then
160
touch "$BACKUP"
@@ -253,7 +245,7 @@ guess_merge_tool () {
245
# Loop over each candidate and stop when a valid merge tool is found.
246
for i in $tools
247
do
256
- merge_tool_path="$(translate_merge_tool_path "$i")"
248
+ merge_tool_path=$(translate_merge_tool_path "$i")
249
if type "$merge_tool_path" >/dev/null 2>&1
250
then
251
echo "$i"
@@ -300,7 +292,7 @@ get_merge_tool_path () {
292
fi
293
if test -z "$merge_tool_path"
294
then
303
- merge_tool_path="$(translate_merge_tool_path "$merge_tool")"
295
+ merge_tool_path=$(translate_merge_tool_path "$merge_tool")
296
fi
297
if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
298
! type "$merge_tool_path" >/dev/null 2>&1
@@ -314,11 +306,11 @@ get_merge_tool_path () {
306
307
get_merge_tool () {
308
# Check if a merge tool has been configured
317
- merge_tool="$(get_configured_merge_tool)"
309
+ merge_tool=$(get_configured_merge_tool)
310
# Try to guess an appropriate merge tool if no tool has been set.
311
if test -z "$merge_tool"
312
then
321
- merge_tool="$(guess_merge_tool)" || exit
313
+ merge_tool=$(guess_merge_tool) || exit
314
fi
315
echo "$merge_tool"
316
}