mergetools: stop setting $status in merge_cmd()

davvid · gitster · commit 1e86d5b11dcf · 2014-11-21T11:27:53.000-08:00
No callers rely on $status so there's don't need to set
it during merge_cmd() for diffmerge, emerge, and kdiff3.

Signed-off-by: David Aguilar &lt;davvid@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/mergetools/diffmerge b/mergetools/diffmerge
@@ -11,5 +11,4 @@ merge_cmd () {
 		"$merge_tool_path" --merge \
 			--result="$MERGED" "$LOCAL" "$REMOTE"
 	fi
-	status=$?
 }
diff --git a/mergetools/emerge b/mergetools/emerge
@@ -15,7 +15,6 @@ merge_cmd () {
 			"$LOCAL" "$REMOTE" \
 			"$(basename "$MERGED")"
 	fi
-	status=$?
 }
 
 translate_merge_tool_path() {
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
@@ -20,5 +20,4 @@ merge_cmd () {
 			-o "$MERGED" "$LOCAL" "$REMOTE" \
 		>/dev/null 2>&1
 	fi
-	status=$?
 }

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,4 @@ merge_cmd () {`
`11`	`11`	`"$merge_tool_path" --merge \`
`12`	`12`	`--result="$MERGED" "$LOCAL" "$REMOTE"`
`13`	`13`	`fi`
`14`		`- status=$?`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ merge_cmd () {`
`15`	`15`	`"$LOCAL" "$REMOTE" \`
`16`	`16`	`"$(basename "$MERGED")"`
`17`	`17`	`fi`
`18`		`- status=$?`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`translate_merge_tool_path() {`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,4 @@ merge_cmd () {`
`20`	`20`	`-o "$MERGED" "$LOCAL" "$REMOTE" \`
`21`	`21`	`>/dev/null 2>&1`
`22`	`22`	`fi`
`23`		`- status=$?`
`24`	`23`	`}`