DORMANTno replies

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

From: Charles Bailey <hidden>
Date: 2016-06-15 22:44:20
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---

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
-}
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help