зеркало из https://github.com/microsoft/git.git
The "table-of-contents" in the update hook script should match the body
44478d99ee
introduced a filter using "git-rev-parse --not --all" to the
log display to prevent the display of revisions already in the
repository. However, the table of contents generation didn't get that
same update.
This patch fixes that. The table of contents before the log and the log
now both display the same list of revisions.
Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
f5d43056a1
Коммит
9a894e8e7c
|
@ -57,7 +57,7 @@ announcerecipients=$(git-repo-config hooks.announcelist)
|
||||||
allowunannotated=$(git-repo-config --bool hooks.allowunannotated)
|
allowunannotated=$(git-repo-config --bool hooks.allowunannotated)
|
||||||
|
|
||||||
# --- Check types
|
# --- Check types
|
||||||
newrev_type=$(git-cat-file -t "$newrev")
|
newrev_type=$(git-cat-file -t $newrev)
|
||||||
|
|
||||||
case "$refname","$newrev_type" in
|
case "$refname","$newrev_type" in
|
||||||
refs/tags/*,commit)
|
refs/tags/*,commit)
|
||||||
|
@ -165,7 +165,7 @@ case "$refname_type" in
|
||||||
baserev=$(git-merge-base $oldrev $newrev)
|
baserev=$(git-merge-base $oldrev $newrev)
|
||||||
|
|
||||||
# Commit with a parent
|
# Commit with a parent
|
||||||
for rev in $(git-rev-list $newrev ^$baserev)
|
for rev in $(git-rev-parse --not --all | git-rev-list --stdin $newrev ^$baserev)
|
||||||
do
|
do
|
||||||
revtype=$(git-cat-file -t "$rev")
|
revtype=$(git-cat-file -t "$rev")
|
||||||
echo " via $rev ($revtype)"
|
echo " via $rev ($revtype)"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче