git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/3] difftool--helper: add explicit exit statement

From
David Aguilar <davvid@gmail.com>
Date
Nov 21, 2014, 01:20 UTC
Message-ID
<1416532829-68662-3-git-send-email-davvid@gmail.com>
In-Reply-To
<1416532829-68662-1-git-send-email-davvid@gmail.com>

git-difftool--helper returns a zero exit status unless --trust-exit-code is in effect. Add an explicit exit statement to make this clearer.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 git-difftool--helper.sh | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index d4fb6df..2b11b1d 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -94,3 +94,5 @@ else
 		shift 7
 	done
 fi
+
+exit 0
-- 
2.2.0.rc2.26.g3e3388f
Previous: Junio C HamanoNext: David Aguilar
Message 4 of 8 in “mergetool/difftool cleanup”
  1. 0/3 mergetool/difftool cleanupDavid Aguilar, Nov 21, 2014
  2. 1/3 mergetool--lib: remove use of $status globalDavid Aguilar, Nov 21, 2014
  3. Junio C HamanoNov 21, 2014
  4. 2/3 difftool--helper: add explicit exit statementDavid Aguilar, Nov 21, 2014
  5. 3/3 mergetool: simplify conditionalsDavid Aguilar, Nov 21, 2014
  6. mergetools: stop setting $status in merge_cmd()David Aguilar, Nov 21, 2014
  7. Junio C HamanoNov 21, 2014
  8. David AguilarNov 22, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.