From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 12 Mar 2007 17:25:58 +0000 (-0400)
Subject: git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
X-Git-Tag: gitgui-0.6.4~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=56a7fde16ed060bc4169cc78308f8cf10f1d92a8;p=git.git

git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44.

Too many users have complained about the credits generator in
git-gui, so I'm backing the entire thing out.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/CREDITS-GEN b/CREDITS-GEN
index d1b0f8635..da2c07629 100755
--- a/CREDITS-GEN
+++ b/CREDITS-GEN
@@ -20,8 +20,8 @@ tree_search ()
 generate_credits ()
 {
 	tip=$1 &&
-	rm -f "$2" &&
-	git shortlog -n -s $tip | sed 's/: .*$//' >"$2" || exit
+	rm -f $CF &&
+	git shortlog -n -s $tip | sed 's/: .*$//' >$CF || exit
 }
 
 # Always use the tarball credits file if found, just
@@ -36,14 +36,10 @@ generate_credits ()
 # that fact.
 #
 
-credits_tmp=/var/tmp/gitgui-credits-$$
-trap 'rm -f "$credits_tmp"' 0
-
-orig="$credits_tmp"
-
 if test -f credits
 then
-	orig=credits
+	rm -f $CF &&
+	cp credits $CF || exit
 elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" &&
    test -n "$prefix" &&
    head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
@@ -51,21 +47,12 @@ elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" &&
    tip=$(tree_search $head $tree) &&
    test -n "$tip"
 then
-	generate_credits $tip "$orig" || exit
+	generate_credits $tip || exit
 elif tip="$(git rev-parse --verify HEAD 2>/dev/null)" &&
    test -n "$tip"
 then
-	generate_credits $tip "$orig" || exit
+	generate_credits $tip || 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
-