{"thread":{"id":"12466","subject":"[PATCH] Remove unused sh functions from git-mergetool.sh","startedAt":"2008-03-03T22:18:17Z","lastAt":"2008-03-03T23:33:10Z","messageCount":2,"participants":["Charles Bailey","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"70844","messageId":"20080303221817.GA7410@hashpling.org","threadId":"12466","inReplyTo":null,"subject":"[PATCH] Remove unused sh functions from git-mergetool.sh","fromName":"Charles Bailey","fromEmail":"charles@hashpling.org","sentAt":"2008-03-03T22:18:17Z","receivedAt":"2008-03-03T22:18:17Z","isPatch":true,"sender":{"key":"charles@hashpling.org","avatar":"https://avatars.githubusercontent.com/u/1668475?v=4"},"body":"The tidy up of git mergetool's backup files handling made the two shell\nfunctions save_backup and remove_backup redundant. This commit removes\nthese now unused functions.\n\nSigned-off-by: Charles Bailey <charles@hashpling.org>\n---\n\nThis patch belongs on top of the mergetool updates in pu. It removes a\ncouple of shell functions which were made redundant in commit\n6fef6e2...  In fact it should logically be squashed into that commit.\n\n\n git-mergetool.sh |   12 ------------\n 1 files changed, 0 insertions(+), 12 deletions(-)\n\ndiff --git a/git-mergetool.sh b/git-mergetool.sh\nindex d12bedf..5c86f69 100755\n--- a/git-mergetool.sh\n+++ b/git-mergetool.sh\n@@ -127,18 +127,6 @@ check_unchanged () {\n     fi\n }\n \n-save_backup () {\n-    if test \"$status\" -eq 0; then\n-\tmv -- \"$BACKUP\" \"$MERGED.orig\"\n-    fi\n-}\n-\n-remove_backup () {\n-    if test \"$status\" -eq 0; then\n-\trm \"$BACKUP\"\n-    fi\n-}\n"},{"id":"70854","messageId":"7vd4qbfknd.fsf@gitster.siamese.dyndns.org","threadId":"12466","inReplyTo":"20080303221817.GA7410@hashpling.org","subject":"Re: [PATCH] Remove unused sh functions from git-mergetool.sh","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-03-03T23:33:10Z","receivedAt":"2008-03-03T23:33:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Charles Bailey <charles@hashpling.org> writes:\n\n> This patch belongs on top of the mergetool updates in pu. It removes a\n> couple of shell functions which were made redundant in commit\n> 6fef6e2...  In fact it should logically be squashed into that commit.\n\nWill do.  Thanks.\n"}]}