undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

difftool: remove the backup file feature

Browse Source 
Most users find the backup file feature annoying and there's no
need for it since diff is supposed to be a read-only operation.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar 2009-04-06 01:31:20 -07:00 committed by Junio C Hamano
parent 76ca653842
commit 2e8af7e42b
1 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
contrib/difftool/git-difftool-helper
View File

@ -9,31 +9,7 @@
# Set GIT_DIFFTOOL_NO_PROMPT to bypass the per-file prompt. # Set GIT_DIFFTOOL_NO_PROMPT to bypass the per-file prompt.
should_prompt () { should_prompt () {
! test -n "$GIT_DIFFTOOL_NO_PROMPT" test -z "$GIT_DIFFTOOL_NO_PROMPT"
}
# Should we keep the backup .orig file?
keep_backup_mode="$(git config --bool merge.keepBackup || echo true)"
keep_backup () {
test "$keep_backup_mode" = "true"
}
# This function manages the backup .orig file.
# A backup $MERGED.orig file is created if changes are detected.
cleanup_temp_files () {
if test -n "$MERGED"; then
if keep_backup && test "$MERGED" -nt "$BACKUP"; then
test -f "$BACKUP" && mv -- "$BACKUP" "$MERGED.orig"
else
rm -f -- "$BACKUP"
fi
fi
}
# This is called when users Ctrl-C out of git-difftool-helper
sigint_handler () {
cleanup_temp_files
exit 1
} }
# This function prepares temporary files and launches the appropriate # This function prepares temporary files and launches the appropriate
@ -47,12 +23,6 @@ launch_merge_tool () {
LOCAL="$2" LOCAL="$2"
REMOTE="$3" REMOTE="$3"
BASE="$1" BASE="$1"
ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')"
BACKUP="$MERGED.BACKUP.$ext"
# Create and ensure that we clean up $BACKUP
test -f "$MERGED" && cp -- "$MERGED" "$BACKUP"
trap sigint_handler INT
# $LOCAL and $REMOTE are temporary files so prompt # $LOCAL and $REMOTE are temporary files so prompt
# the user with the real $MERGED name before launching $merge_tool. # the user with the real $MERGED name before launching $merge_tool.
@ -120,8 +90,6 @@ launch_merge_tool () {
fi fi
;; ;;
esac esac
cleanup_temp_files
} }
# Verifies that (difftool|mergetool).<tool>.cmd exists # Verifies that (difftool|mergetool).<tool>.cmd exists