"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes:
> Which files, specifically? I'm sure that the following would be
> built as root during 'make install':
>
> GIT-CFLAGS
> GIT-VERSION-FILE
> git-gui/GIT-VERSION-FILE
> git-gui/CREDITS-FILE
>
> as these are rebuilt automatically everytime the Makefile runs,
> as they are embedding version data from HEAD.
We should strive to make sure that "find -type f -newer .stamp"
after "make all; date >.stamp; sleep 2; make all" reports
nothing. Otherwise we would break:
$ make all
$ su
# make install
How about doing something like this (you would need -p2 to apply
to your tree)?
diff --git a/git-gui/CREDITS-GEN b/git-gui/CREDITS-GEN
index da2c076..d1b0f86 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
+
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html