All of lore.kernel.org
 help / color / mirror / Atom feed
From: Charles Bailey <charles@hashpling.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] Remove unused sh functions from git-mergetool.sh
Date: Mon, 3 Mar 2008 22:18:17 +0000	[thread overview]
Message-ID: <20080303221817.GA7410@hashpling.org> (raw)

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

             reply	other threads:[~2008-03-03 22:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-03 22:18 Charles Bailey [this message]
2008-03-03 23:33 ` [PATCH] Remove unused sh functions from git-mergetool.sh Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080303221817.GA7410@hashpling.org \
    --to=charles@hashpling.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.