summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-24 23:33:12 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-24 23:33:12 -0800
commitcef19c7af5202c547abe4c8a538ac7b9a4970f0e (patch)
tree63cf6a0222f31e41f2ec8f9c7409a5ab2a022690 /git-gui
parent5089277718503a4de7817b5f6754cb03116d5524 (diff)
parent92446aba47b0e0db28f7b858ea387efcca30ab44 (diff)
downloadgit-cef19c7af5202c547abe4c8a538ac7b9a4970f0e.tar.gz
Merge git://repo.or.cz/git-gui into maint
* git://repo.or.cz/git-gui: Don't modify CREDITS-FILE if it hasn't changed.
Diffstat (limited to 'git-gui')
-rwxr-xr-xgit-gui/CREDITS-GEN25
1 files changed, 19 insertions, 6 deletions
diff --git a/git-gui/CREDITS-GEN b/git-gui/CREDITS-GEN
index da2c07629e..d1b0f86355 100755
--- a/git-gui/CREDITS-GEN
+++ b/git-gui/CREDITS-GEN
@@ -20,8 +20,8 @@ tree_search ()
generate_credits ()
{
tip=$1 &&
- rm -f $CF &&
- git shortlog -n -s $tip | sed 's/: .*$//' >$CF || exit
+ rm -f "$2" &&
+ git shortlog -n -s $tip | sed 's/: .*$//' >"$2" || exit
}
# Always use the tarball credits file if found, just
@@ -36,10 +36,14 @@ generate_credits ()
# that fact.
#
+credits_tmp=/var/tmp/gitgui-credits-$$
+trap 'rm -f "$credits_tmp"' 0
+
+orig="$credits_tmp"
+
if test -f credits
then
- rm -f $CF &&
- cp credits $CF || exit
+ orig=credits
elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" &&
test -n "$prefix" &&
head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
@@ -47,12 +51,21 @@ elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" &&
tip=$(tree_search $head $tree) &&
test -n "$tip"
then
- generate_credits $tip || exit
+ generate_credits $tip "$orig" || exit
elif tip="$(git rev-parse --verify HEAD 2>/dev/null)" &&
test -n "$tip"
then
- generate_credits $tip || exit
+ generate_credits $tip "$orig" || exit
else
echo "error: Cannot locate authorship information." >&2
exit 1
fi
+
+if test -f "$orig" && cmp -s "$orig" "$CF"
+then
+ : noop
+else
+ rm -f "$CF" &&
+ cat "$orig" >"$CF"
+fi
+