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

[PATCH] Remove unused sh functions from git-mergetool.sh

From
Charles Bailey <charles@hashpling.org>
Date
Mar 3, 2008, 22:18 UTC
Message-ID
<20080303221817.GA7410@hashpling.org>

The tidy up of git mergetool's backup files handling made the two shell functions save_backup and remove_backup redundant. This commit removes these now unused functions.

Signed-off-by: Charles Bailey <charles@hashpling.org>
---

This patch belongs on top of the mergetool updates in pu. It removes a couple of shell functions which were made redundant in commit 6fef6e2... In fact it should logically be squashed into that commit.

 git-mergetool.sh |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index d12bedf..5c86f69 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -127,18 +127,6 @@ check_unchanged () {
     fi
 }
 
-save_backup () {
-    if test "$status" -eq 0; then
-	mv -- "$BACKUP" "$MERGED.orig"
-    fi
-}
-
-remove_backup () {
-    if test "$status" -eq 0; then
-	rm "$BACKUP"
-    fi
-}
Next: Junio C Hamano
Message 1 of 2 in “Remove unused sh functions from git-mergetool.sh”
  1. Remove unused sh functions from git-mergetool.shCharles Bailey, Mar 3, 2008
  2. Junio C HamanoMar 3, 2008

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.