mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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.
This commit is contained in:
commit
cef19c7af5
|
@ -20,8 +20,8 @@ tree_search ()
|
||||||
generate_credits ()
|
generate_credits ()
|
||||||
{
|
{
|
||||||
tip=$1 &&
|
tip=$1 &&
|
||||||
rm -f $CF &&
|
rm -f "$2" &&
|
||||||
git shortlog -n -s $tip | sed 's/: .*$//' >$CF || exit
|
git shortlog -n -s $tip | sed 's/: .*$//' >"$2" || exit
|
||||||
}
|
}
|
||||||
|
|
||||||
# Always use the tarball credits file if found, just
|
# Always use the tarball credits file if found, just
|
||||||
|
@ -36,10 +36,14 @@ generate_credits ()
|
||||||
# that fact.
|
# that fact.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
credits_tmp=/var/tmp/gitgui-credits-$$
|
||||||
|
trap 'rm -f "$credits_tmp"' 0
|
||||||
|
|
||||||
|
orig="$credits_tmp"
|
||||||
|
|
||||||
if test -f credits
|
if test -f credits
|
||||||
then
|
then
|
||||||
rm -f $CF &&
|
orig=credits
|
||||||
cp credits $CF || exit
|
|
||||||
elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" &&
|
elif prefix="$(git rev-parse --show-prefix 2>/dev/null)" &&
|
||||||
test -n "$prefix" &&
|
test -n "$prefix" &&
|
||||||
head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
|
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) &&
|
tip=$(tree_search $head $tree) &&
|
||||||
test -n "$tip"
|
test -n "$tip"
|
||||||
then
|
then
|
||||||
generate_credits $tip || exit
|
generate_credits $tip "$orig" || exit
|
||||||
elif tip="$(git rev-parse --verify HEAD 2>/dev/null)" &&
|
elif tip="$(git rev-parse --verify HEAD 2>/dev/null)" &&
|
||||||
test -n "$tip"
|
test -n "$tip"
|
||||||
then
|
then
|
||||||
generate_credits $tip || exit
|
generate_credits $tip "$orig" || exit
|
||||||
else
|
else
|
||||||
echo "error: Cannot locate authorship information." >&2
|
echo "error: Cannot locate authorship information." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test -f "$orig" && cmp -s "$orig" "$CF"
|
||||||
|
then
|
||||||
|
: noop
|
||||||
|
else
|
||||||
|
rm -f "$CF" &&
|
||||||
|
cat "$orig" >"$CF"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue