List for cgit developers and users
 help / color / mirror / Atom feed
* [PATCH 1/1] git: update to v2.29.1
@ 2020-10-27  9:42 Christian Hesse
  2020-10-31  8:56 ` jean-christophe manciot
  0 siblings, 1 reply; 10+ messages in thread
From: Christian Hesse @ 2020-10-27  9:42 UTC (permalink / raw)
  To: cgit; +Cc: Christian Hesse

From: Christian Hesse <mail@eworm.de>

Update to git version v2.29.1. No functional change, but we want latest
and greated version number, no? 😜

Signed-off-by: Christian Hesse <mail@eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c947b63..eb60388 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.29.0
+GIT_VER = 2.29.1
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index 69986e1..b927c80 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 69986e19ffcfb9af674ae5180689ab7bbf92ed28
+Subproject commit b927c80531cca9b9107754186532e8cb00884008

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] git: update to v2.29.1
  2020-10-27  9:42 [PATCH 1/1] git: update to v2.29.1 Christian Hesse
@ 2020-10-31  8:56 ` jean-christophe manciot
  2020-10-31  9:20   ` jean-christophe manciot
  2020-11-01 20:17   ` Christian Hesse
  0 siblings, 2 replies; 10+ messages in thread
From: jean-christophe manciot @ 2020-10-31  8:56 UTC (permalink / raw)
  To: Christian Hesse; +Cc: cgit, Christian Hesse

Hey Christian,
I tried to apply yesterday (when the latest tag of 'git' submodule was
v2.29.1) the following patches in sequence over v1.2.3-8-gadcc4f8:
- 'ui-tree: add about link in tree view list' 1/2
- 'ui-tree: add about link in tree view list' 2/2
- 'Make default pages configurable'
- 'ui-commit: show subject in page title'
- 'git: update to v2.29.1'

---------------------------------------------------------------
Applying 'ui-tree: add about link in tree view list' 1/2 patch
---------------------------------------------------------------
Checking patch ui-shared.c...
Checking patch ui-shared.h...
Checking patch ui-tree.c...
Applied patch ui-shared.c cleanly.
Applied patch ui-shared.h cleanly.
Applied patch ui-tree.c cleanly.
---------------------------------------------------------------
Applying 'ui-tree: add about link in tree view list' 2/2 patch
---------------------------------------------------------------
Checking patch ui-tree.c...
Applied patch ui-tree.c cleanly.
-------------------------------------------------
Applying 'Make default pages configurable' patch
-------------------------------------------------
Checking patch cgit.c...
Hunk #1 succeeded at 56 (offset 10 lines).
Hunk #2 succeeded at 143 (offset 10 lines).
Hunk #3 succeeded at 159 (offset 10 lines).
Hunk #4 succeeded at 383 (offset 10 lines).
Hunk #5 succeeded at 404 (offset 10 lines).
Hunk #6 succeeded at 814 (offset 5 lines).
Checking patch cgit.h...
Checking patch cgitrc.5.txt...
Hunk #3 succeeded at 485 (offset 3 lines).
Checking patch cmd.c...
Checking patch ui-repolist.c...
Checking patch ui-shared.c...
Hunk #2 succeeded at 1006 (offset 6 lines).
Hunk #3 succeeded at 1095 (offset 6 lines).
Checking patch ui-shared.h...
Applied patch cgit.c cleanly.
Applied patch cgit.h cleanly.
Applied patch cgitrc.5.txt cleanly.
Applied patch cmd.c cleanly.
Applied patch ui-repolist.c cleanly.
Applied patch ui-shared.c cleanly.
Applied patch ui-shared.h cleanly.
-------------------------------------------------------
Applying 'ui-commit: show subject in page title' patch
-------------------------------------------------------
Checking patch ui-commit.c...
Applied patch ui-commit.c cleanly.
----------------------------------------
Applying 'git: update to v2.29.1' patch
----------------------------------------
Checking patch Makefile...
Checking patch git...
warning: unable to rmdir 'git': Directory not empty
Applied patch Makefile cleanly.
Applied patch git cleanly.

The build fails with:
    SUBDIR tests
ok 1 - extract Git version from Makefile
not ok 2 - test Git version matches Makefile
#
# ( cat ../../git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) |
# sed -e "s/GIT_VERSION[ ]*=[ ]*//" -e "s/\\.dirty$//" >git_version &&
# sed -e "s/-/./g" makefile_version >makefile_git_version &&
# test_cmp git_version makefile_git_version
#
not ok 3 - test submodule version matches Makefile
#
# if ! test -e ../../git/.git
# then
# echo "git/ is not a Git repository" >&2
# else
# (
# cd ../.. &&
# sm_oid=$(git ls-files --stage -- git |
# sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") &&
# cd git &&
# git describe --match "v[0-9]*" $sm_oid
# ) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
# test_cmp sm_version makefile_version
# fi
#
# failed 2 among 3 test(s)
1..3

There is no such issue when applying the four first patches over the
same commit.
-- 
Jean-Christophe

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] git: update to v2.29.1
  2020-10-31  8:56 ` jean-christophe manciot
@ 2020-10-31  9:20   ` jean-christophe manciot
  2020-11-01 20:17   ` Christian Hesse
  1 sibling, 0 replies; 10+ messages in thread
From: jean-christophe manciot @ 2020-10-31  9:20 UTC (permalink / raw)
  To: Christian Hesse; +Cc: cgit, Christian Hesse

[-- Attachment #1: Type: text/plain, Size: 52 bytes --]

The full build log is attached.
-- 
Jean-Christophe

[-- Attachment #2: cgit_1.2.3-8-gadcc4f8_amd64.log --]
[-- Type: text/x-log, Size: 21770 bytes --]

---------------
Compiling: make
---------------
    SUBDIR git
CGIT_VERSION = v1.2.3-8-gadcc
GIT_VERSION = 2.29.0
    * new build flags
    * new CGit build flags
    CC ../cgit.o
    CC ../cache.o
    CC ../cmd.o
    CC ../configfile.o
    CC ../filter.o
    CC ../html.o
    CC ../parsing.o
    CC ../scan-tree.o
    CC ../shared.o
    CC ../ui-atom.o
    CC ../ui-blame.o
    CC ../ui-blob.o
    CC ../ui-clone.o
    CC ../ui-commit.o
    CC ../ui-diff.o
    CC ../ui-log.o
    CC ../ui-patch.o
    CC ../ui-plain.o
    CC ../ui-refs.o
    CC ../ui-repolist.o
    CC ../ui-shared.o
    CC ../ui-snapshot.o
    CC ../ui-ssdiff.o
    CC ../ui-stats.o
    CC ../ui-summary.o
    CC ../ui-tag.o
    CC ../ui-tree.o
    * new link flags
    CC common-main.o
    CC abspath.o
    CC add-interactive.o
    CC add-patch.o
    CC advice.o
    CC alias.o
    CC alloc.o
    CC apply.o
    CC archive-tar.o
    CC archive-zip.o
    CC archive.o
    * new prefix flags
    CC attr.o
    CC base85.o
    CC bisect.o
    CC blame.o
    CC blob.o
    CC bloom.o
    CC branch.o
    CC bulk-checkin.o
    CC bundle.o
    CC cache-tree.o
    CC chdir-notify.o
    CC checkout.o
    CC color.o
    CC column.o
    CC combine-diff.o
    CC commit-graph.o
    CC commit-reach.o
    CC commit.o
    CC compat/obstack.o
    CC compat/terminal.o
    CC config.o
    CC connect.o
    CC connected.o
    CC convert.o
    CC copy.o
    CC credential.o
    CC csum-file.o
    CC ctype.o
    CC date.o
    CC decorate.o
    CC delta-islands.o
    CC diff-delta.o
    CC diff-lib.o
    CC diff-no-index.o
    CC diff.o
    CC diffcore-break.o
    CC diffcore-delta.o
    CC diffcore-order.o
    CC diffcore-pickaxe.o
    CC diffcore-rename.o
    CC dir-iterator.o
    CC dir.o
    CC editor.o
    CC entry.o
    CC environment.o
    CC ewah/bitmap.o
    CC ewah/ewah_bitmap.o
    CC ewah/ewah_io.o
    CC ewah/ewah_rlw.o
    CC exec-cmd.o
    CC fetch-negotiator.o
    CC fetch-pack.o
    CC fmt-merge-msg.o
    CC fsck.o
    CC fsmonitor.o
    CC gettext.o
    CC gpg-interface.o
    CC graph.o
    CC grep.o
    CC hashmap.o
    GEN command-list.h
    CC help.o
    CC hex.o
    CC ident.o
    CC json-writer.o
    CC kwset.o
    CC levenshtein.o
    CC line-log.o
    CC line-range.o
    CC linear-assignment.o
    CC list-objects-filter-options.o
    CC list-objects-filter.o
    CC list-objects.o
    CC ll-merge.o
    CC lockfile.o
    CC log-tree.o
    CC ls-refs.o
    CC mailinfo.o
    CC mailmap.o
    CC match-trees.o
    CC mem-pool.o
    CC merge-blobs.o
    CC merge-recursive.o
    CC merge.o
    CC mergesort.o
    CC midx.o
    CC name-hash.o
    CC negotiator/default.o
    CC negotiator/noop.o
    CC negotiator/skipping.o
    CC notes-cache.o
    CC notes-merge.o
    CC notes-utils.o
    CC notes.o
    CC object.o
    CC oid-array.o
    CC oidmap.o
    CC oidset.o
    CC pack-bitmap-write.o
    CC pack-bitmap.o
    CC pack-check.o
    CC pack-objects.o
    CC pack-revindex.o
    CC pack-write.o
    CC packfile.o
    CC pager.o
    CC parse-options-cb.o
    CC parse-options.o
    CC patch-delta.o
    CC patch-ids.o
    CC path.o
    CC pathspec.o
    CC pkt-line.o
    CC preload-index.o
    CC pretty.o
    CC prio-queue.o
    CC progress.o
    CC promisor-remote.o
    CC prompt.o
    CC protocol.o
    CC prune-packed.o
    CC quote.o
    CC range-diff.o
    CC reachable.o
    CC read-cache.o
    CC rebase-interactive.o
    CC rebase.o
    CC ref-filter.o
    CC reflog-walk.o
    CC refs.o
    CC refs/debug.o
    CC refs/files-backend.o
    CC refs/iterator.o
    CC refs/packed-backend.o
    CC refs/ref-cache.o
    CC refspec.o
    CC remote.o
    CC replace-object.o
    CC repo-settings.o
    CC repository.o
    CC rerere.o
    CC reset.o
    CC resolve-undo.o
    CC revision.o
    CC run-command.o
    CC send-pack.o
    CC sequencer.o
    CC serve.o
    CC server-info.o
    CC setup.o
    CC sha1-file.o
    CC sha1-lookup.o
    CC sha1-name.o
    CC shallow.o
    CC sideband.o
    CC sigchain.o
    CC split-index.o
    CC stable-qsort.o
    CC strbuf.o
    CC streaming.o
    CC string-list.o
    CC strvec.o
    CC sub-process.o
    CC submodule-config.o
    CC submodule.o
    CC symlinks.o
    CC tag.o
    CC tempfile.o
    CC thread-utils.o
    CC tmp-objdir.o
    CC trace.o
    CC trace2.o
    CC trace2/tr2_cfg.o
    CC trace2/tr2_cmd_name.o
    CC trace2/tr2_dst.o
    CC trace2/tr2_sid.o
    CC trace2/tr2_sysenv.o
    CC trace2/tr2_tbuf.o
    CC trace2/tr2_tgt_event.o
    CC trace2/tr2_tgt_normal.o
    CC trace2/tr2_tgt_perf.o
    CC trace2/tr2_tls.o
    CC trailer.o
    CC transport-helper.o
    CC transport.o
    CC tree-diff.o
    CC tree-walk.o
    CC tree.o
    CC unpack-trees.o
    CC upload-pack.o
    CC url.o
    CC urlmatch.o
    CC usage.o
    CC userdiff.o
    CC utf8.o
    CC varint.o
    CC version.o
    CC versioncmp.o
    CC walker.o
    CC wildmatch.o
    CC worktree.o
    CC wrapper.o
    CC write-or-die.o
    CC ws.o
    CC wt-status.o
    CC xdiff-interface.o
    CC zlib.o
    CC unix-socket.o
    CC sha1dc_git.o
    CC sha1collisiondetection/lib/sha1.o
    CC sha1collisiondetection/lib/ubc_check.o
    CC sha256/block/sha256.o
    CC compat/fopen.o
    CC compat/strlcpy.o
    CC compat/qsort_s.o
    AR libgit.a
    CC xdiff/xdiffi.o
    CC xdiff/xemit.o
    CC xdiff/xhistogram.o
    CC xdiff/xmerge.o
    CC xdiff/xpatience.o
    CC xdiff/xprepare.o
    CC xdiff/xutils.o
    AR xdiff/lib.a
    * linking with autodetected luajit
    LINK ../cgit
-------------------------------------------------------
Working around an issue with 'a2x -f pdf cgitrc.5.txt':
sed --follow-symlinks -Ei 's|^(.*a2x -f pdf cgitrc.5.txt)$|#\1|g' Makefile
--------------------------------------------------------------------------
------------------------
Compiling Docs: make doc
------------------------
a2x -f manpage cgitrc.5.txt
asciidoc  -b xhtml11 -o cgitrc.5.html+ cgitrc.5.txt && \
mv cgitrc.5.html+ cgitrc.5.html
------------------
Testing: make test
------------------
    SUBDIR git
    CC fuzz-commit-graph.o
    CC fuzz-pack-headers.o
    CC fuzz-pack-idx.o
    CC daemon.o
    LINK git-daemon
    CC http-backend.o
    LINK git-http-backend
    CC imap-send.o
    LINK git-imap-send
    CC sh-i18n--envsubst.o
    LINK git-sh-i18n--envsubst
    CC shell.o
    LINK git-shell
    * new script parameters
    GEN git-bisect
    GEN git-difftool--helper
    GEN git-filter-branch
    GEN git-merge-octopus
    GEN git-merge-one-file
    GEN git-merge-resolve
    GEN git-mergetool
    GEN git-quiltimport
    GEN git-request-pull
    GEN git-submodule
    GEN git-web--browse
    * new perl-specific parameters
    GEN GIT-PERL-HEADER
    GEN git-add--interactive
    GEN git-archimport
    GEN git-cvsexportcommit
    GEN git-cvsimport
    GEN git-cvsserver
    GEN git-send-email
    GEN git-svn
    * new Python interpreter location
    GEN git-p4
    GEN git-instaweb
    CC git.o
    CC builtin/add.o
    CC builtin/am.o
    CC builtin/annotate.o
    CC builtin/apply.o
    CC builtin/archive.o
    CC builtin/bisect--helper.o
    CC builtin/blame.o
    CC builtin/branch.o
    CC builtin/bugreport.o
    CC builtin/bundle.o
    CC builtin/cat-file.o
    CC builtin/check-attr.o
    CC builtin/check-ignore.o
    CC builtin/check-mailmap.o
    CC builtin/check-ref-format.o
    CC builtin/checkout-index.o
    CC builtin/checkout.o
    CC builtin/clean.o
    CC builtin/clone.o
    CC builtin/column.o
    CC builtin/commit-graph.o
    CC builtin/commit-tree.o
    CC builtin/commit.o
    CC builtin/config.o
    CC builtin/count-objects.o
    CC builtin/credential-cache--daemon.o
    CC builtin/credential-cache.o
    CC builtin/credential-store.o
    CC builtin/credential.o
    CC builtin/describe.o
    CC builtin/diff-files.o
    CC builtin/diff-index.o
    CC builtin/diff-tree.o
    CC builtin/diff.o
    CC builtin/difftool.o
    CC builtin/env--helper.o
    CC builtin/fast-export.o
    CC builtin/fast-import.o
    CC builtin/fetch-pack.o
    CC builtin/fetch.o
    CC builtin/fmt-merge-msg.o
    CC builtin/for-each-ref.o
    CC builtin/fsck.o
    CC builtin/gc.o
    CC builtin/get-tar-commit-id.o
    CC builtin/grep.o
    CC builtin/hash-object.o
    GEN config-list.h
    CC builtin/help.o
    CC builtin/index-pack.o
    CC builtin/init-db.o
    CC builtin/interpret-trailers.o
    CC builtin/log.o
    CC builtin/ls-files.o
    CC builtin/ls-remote.o
    CC builtin/ls-tree.o
    CC builtin/mailinfo.o
    CC builtin/mailsplit.o
    CC builtin/merge-base.o
    CC builtin/merge-file.o
    CC builtin/merge-index.o
    CC builtin/merge-ours.o
    CC builtin/merge-recursive.o
    CC builtin/merge-tree.o
    CC builtin/merge.o
    CC builtin/mktag.o
    CC builtin/mktree.o
    CC builtin/multi-pack-index.o
    CC builtin/mv.o
    CC builtin/name-rev.o
    CC builtin/notes.o
    CC builtin/pack-objects.o
    CC builtin/pack-redundant.o
    CC builtin/pack-refs.o
    CC builtin/patch-id.o
    CC builtin/prune-packed.o
    CC builtin/prune.o
    CC builtin/pull.o
    CC builtin/push.o
    CC builtin/range-diff.o
    CC builtin/read-tree.o
    CC builtin/rebase.o
    CC builtin/receive-pack.o
    CC builtin/reflog.o
    CC builtin/remote-ext.o
    CC builtin/remote-fd.o
    CC builtin/remote.o
    CC builtin/repack.o
    CC builtin/replace.o
    CC builtin/rerere.o
    CC builtin/reset.o
    CC builtin/rev-list.o
    CC builtin/rev-parse.o
    CC builtin/revert.o
    CC builtin/rm.o
    CC builtin/send-pack.o
    CC builtin/shortlog.o
    CC builtin/show-branch.o
    CC builtin/show-index.o
    CC builtin/show-ref.o
    CC builtin/sparse-checkout.o
    CC builtin/stash.o
    CC builtin/stripspace.o
    CC builtin/submodule--helper.o
    CC builtin/symbolic-ref.o
    CC builtin/tag.o
    CC builtin/unpack-file.o
    CC builtin/unpack-objects.o
    CC builtin/update-index.o
    CC builtin/update-ref.o
    CC builtin/update-server-info.o
    CC builtin/upload-archive.o
    CC builtin/upload-pack.o
    CC builtin/var.o
    CC builtin/verify-commit.o
    CC builtin/verify-pack.o
    CC builtin/verify-tag.o
    CC builtin/worktree.o
    CC builtin/write-tree.o
    LINK git
    BUILTIN git-add
    BUILTIN git-am
    BUILTIN git-annotate
    BUILTIN git-apply
    BUILTIN git-archive
    BUILTIN git-bisect--helper
    BUILTIN git-blame
    BUILTIN git-branch
    BUILTIN git-bugreport
    BUILTIN git-bundle
    BUILTIN git-cat-file
    BUILTIN git-check-attr
    BUILTIN git-check-ignore
    BUILTIN git-check-mailmap
    BUILTIN git-check-ref-format
    BUILTIN git-checkout-index
    BUILTIN git-checkout
    BUILTIN git-clean
    BUILTIN git-clone
    BUILTIN git-column
    BUILTIN git-commit-graph
    BUILTIN git-commit-tree
    BUILTIN git-commit
    BUILTIN git-config
    BUILTIN git-count-objects
    BUILTIN git-credential-cache--daemon
    BUILTIN git-credential-cache
    BUILTIN git-credential-store
    BUILTIN git-credential
    BUILTIN git-describe
    BUILTIN git-diff-files
    BUILTIN git-diff-index
    BUILTIN git-diff-tree
    BUILTIN git-diff
    BUILTIN git-difftool
    BUILTIN git-env--helper
    BUILTIN git-fast-export
    BUILTIN git-fast-import
    BUILTIN git-fetch-pack
    BUILTIN git-fetch
    BUILTIN git-fmt-merge-msg
    BUILTIN git-for-each-ref
    BUILTIN git-fsck
    BUILTIN git-gc
    BUILTIN git-get-tar-commit-id
    BUILTIN git-grep
    BUILTIN git-hash-object
    BUILTIN git-help
    BUILTIN git-index-pack
    BUILTIN git-init-db
    BUILTIN git-interpret-trailers
    BUILTIN git-log
    BUILTIN git-ls-files
    BUILTIN git-ls-remote
    BUILTIN git-ls-tree
    BUILTIN git-mailinfo
    BUILTIN git-mailsplit
    BUILTIN git-merge-base
    BUILTIN git-merge-file
    BUILTIN git-merge-index
    BUILTIN git-merge-ours
    BUILTIN git-merge-recursive
    BUILTIN git-merge-tree
    BUILTIN git-merge
    BUILTIN git-mktag
    BUILTIN git-mktree
    BUILTIN git-multi-pack-index
    BUILTIN git-mv
    BUILTIN git-name-rev
    BUILTIN git-notes
    BUILTIN git-pack-objects
    BUILTIN git-pack-redundant
    BUILTIN git-pack-refs
    BUILTIN git-patch-id
    BUILTIN git-prune-packed
    BUILTIN git-prune
    BUILTIN git-pull
    BUILTIN git-push
    BUILTIN git-range-diff
    BUILTIN git-read-tree
    BUILTIN git-rebase
    BUILTIN git-receive-pack
    BUILTIN git-reflog
    BUILTIN git-remote-ext
    BUILTIN git-remote-fd
    BUILTIN git-remote
    BUILTIN git-repack
    BUILTIN git-replace
    BUILTIN git-rerere
    BUILTIN git-reset
    BUILTIN git-rev-list
    BUILTIN git-rev-parse
    BUILTIN git-revert
    BUILTIN git-rm
    BUILTIN git-send-pack
    BUILTIN git-shortlog
    BUILTIN git-show-branch
    BUILTIN git-show-index
    BUILTIN git-show-ref
    BUILTIN git-sparse-checkout
    BUILTIN git-stash
    BUILTIN git-stripspace
    BUILTIN git-submodule--helper
    BUILTIN git-symbolic-ref
    BUILTIN git-tag
    BUILTIN git-unpack-file
    BUILTIN git-unpack-objects
    BUILTIN git-update-index
    BUILTIN git-update-ref
    BUILTIN git-update-server-info
    BUILTIN git-upload-archive
    BUILTIN git-upload-pack
    BUILTIN git-var
    BUILTIN git-verify-commit
    BUILTIN git-verify-pack
    BUILTIN git-verify-tag
    BUILTIN git-worktree
    BUILTIN git-write-tree
    BUILTIN git-cherry
    BUILTIN git-cherry-pick
    BUILTIN git-format-patch
    BUILTIN git-fsck-objects
    BUILTIN git-init
    BUILTIN git-merge-subtree
    BUILTIN git-restore
    BUILTIN git-show
    BUILTIN git-stage
    BUILTIN git-status
    BUILTIN git-switch
    BUILTIN git-whatchanged
    GEN git-mergetool--lib
    GEN git-parse-remote
    GEN git-rebase--preserve-merges
    GEN git-sh-i18n
    GEN git-sh-setup
    SUBDIR git-gui
GITGUI_VERSION = 0.21.0.78.g38c2a
    * new locations or Tcl/Tk interpreter
    GEN git-gui
    INDEX lib/
    MSGFMT    po/bg.msg 565 translated.
    MSGFMT    po/de.msg 579 translated.
    MSGFMT    po/el.msg 381 translated, 4 fuzzy, 6 untranslated.
    MSGFMT    po/fr.msg 520 translated.
    MSGFMT    po/hu.msg 514 translated.
    MSGFMT    po/it.msg 519 translated, 1 untranslated.
    MSGFMT    po/ja.msg 546 translated, 1 untranslated.
    MSGFMT    po/nb.msg 474 translated, 39 untranslated.
    MSGFMT po/pt_br.msg 520 translated.
    MSGFMT po/pt_pt.msg 550 translated.
    MSGFMT    po/ru.msg 520 translated.
    MSGFMT    po/sv.msg 547 translated.
    MSGFMT    po/vi.msg 543 translated.
    MSGFMT po/zh_cn.msg 366 translated, 7 fuzzy, 17 untranslated.
    SUBDIR gitk-git
    * new Tcl/Tk interpreter location
    GEN gitk-wish
Generating catalog po/bg.msg
msgfmt --statistics --tcl po/bg.po -l bg -d po/
317 translated messages.
Generating catalog po/ca.msg
msgfmt --statistics --tcl po/ca.po -l ca -d po/
307 translated messages.
Generating catalog po/de.msg
msgfmt --statistics --tcl po/de.po -l de -d po/
307 translated messages.
Generating catalog po/es.msg
msgfmt --statistics --tcl po/es.po -l es -d po/
184 translated messages, 46 fuzzy translations, 77 untranslated messages.
Generating catalog po/fr.msg
msgfmt --statistics --tcl po/fr.po -l fr -d po/
311 translated messages.
Generating catalog po/hu.msg
msgfmt --statistics --tcl po/hu.po -l hu -d po/
277 translated messages, 18 fuzzy translations, 12 untranslated messages.
Generating catalog po/it.msg
msgfmt --statistics --tcl po/it.po -l it -d po/
274 translated messages, 17 fuzzy translations, 16 untranslated messages.
Generating catalog po/ja.msg
msgfmt --statistics --tcl po/ja.po -l ja -d po/
311 translated messages.
Generating catalog po/pt_br.msg
msgfmt --statistics --tcl po/pt_br.po -l pt_br -d po/
279 translated messages, 16 fuzzy translations, 12 untranslated messages.
Generating catalog po/pt_pt.msg
msgfmt --statistics --tcl po/pt_pt.po -l pt_pt -d po/
311 translated messages.
Generating catalog po/ru.msg
msgfmt --statistics --tcl po/ru.po -l ru -d po/
317 translated messages.
Generating catalog po/sv.msg
msgfmt --statistics --tcl po/sv.po -l sv -d po/
311 translated messages.
Generating catalog po/vi.msg
msgfmt --statistics --tcl po/vi.po -l vi -d po/
307 translated messages.
Generating catalog po/zh_cn.msg
msgfmt --statistics --tcl po/zh_cn.po -l zh_cn -d po/
317 translated messages.
    SUBDIR templates
    MSGFMT po/build/locale/bg/LC_MESSAGES/git.mo
5013 translated messages.
    MSGFMT po/build/locale/ca/LC_MESSAGES/git.mo
4112 translated messages, 813 fuzzy translations, 88 untranslated messages.
    MSGFMT po/build/locale/de/LC_MESSAGES/git.mo
5013 translated messages.
    MSGFMT po/build/locale/el/LC_MESSAGES/git.mo
1038 translated messages, 3325 untranslated messages.
    MSGFMT po/build/locale/es/LC_MESSAGES/git.mo
4931 translated messages.
    MSGFMT po/build/locale/fr/LC_MESSAGES/git.mo
5013 translated messages.
    MSGFMT po/build/locale/is/LC_MESSAGES/git.mo
14 translated messages.
    MSGFMT po/build/locale/it/LC_MESSAGES/git.mo
5013 translated messages.
    MSGFMT po/build/locale/ko/LC_MESSAGES/git.mo
3608 translated messages.
    MSGFMT po/build/locale/pt_PT/LC_MESSAGES/git.mo
2877 translated messages, 1290 fuzzy translations, 846 untranslated messages.
    MSGFMT po/build/locale/ru/LC_MESSAGES/git.mo
3521 translated messages, 1060 untranslated messages.
    MSGFMT po/build/locale/sv/LC_MESSAGES/git.mo
5013 translated messages.
    MSGFMT po/build/locale/tr/LC_MESSAGES/git.mo
5013 translated messages.
    MSGFMT po/build/locale/vi/LC_MESSAGES/git.mo
5013 translated messages.
    MSGFMT po/build/locale/zh_CN/LC_MESSAGES/git.mo
5013 translated messages.
    MSGFMT po/build/locale/zh_TW/LC_MESSAGES/git.mo
5011 translated messages, 2 fuzzy translations.
    GEN perl/build/lib/Git.pm
    GEN perl/build/lib/Git/I18N.pm
    GEN perl/build/lib/Git/IndexInfo.pm
    GEN perl/build/lib/Git/LoadCPAN.pm
    GEN perl/build/lib/Git/Packet.pm
    GEN perl/build/lib/Git/SVN.pm
    GEN perl/build/lib/Git/LoadCPAN/Error.pm
    GEN perl/build/lib/Git/SVN/Editor.pm
    GEN perl/build/lib/Git/SVN/Fetcher.pm
    GEN perl/build/lib/Git/SVN/GlobSpec.pm
    GEN perl/build/lib/Git/SVN/Log.pm
    GEN perl/build/lib/Git/SVN/Migration.pm
    GEN perl/build/lib/Git/SVN/Prompt.pm
    GEN perl/build/lib/Git/SVN/Ra.pm
    GEN perl/build/lib/Git/SVN/Utils.pm
    GEN perl/build/lib/Git/LoadCPAN/Mail/Address.pm
    GEN perl/build/lib/Git/SVN/Memoize/YAML.pm
    GEN perl/build/lib/FromCPAN/Error.pm
    GEN perl/build/lib/FromCPAN/Mail/Address.pm
    CC t/helper/test-fake-ssh.o
    LINK t/helper/test-fake-ssh
    CC t/helper/test-tool.o
    CC t/helper/test-advise.o
    CC t/helper/test-bloom.o
    CC t/helper/test-chmtime.o
    CC t/helper/test-config.o
    CC t/helper/test-ctype.o
    CC t/helper/test-date.o
    CC t/helper/test-delta.o
    CC t/helper/test-dir-iterator.o
    CC t/helper/test-drop-caches.o
    CC t/helper/test-dump-cache-tree.o
    CC t/helper/test-dump-fsmonitor.o
    CC t/helper/test-dump-split-index.o
    CC t/helper/test-dump-untracked-cache.o
    CC t/helper/test-example-decorate.o
    CC t/helper/test-genrandom.o
    CC t/helper/test-genzeros.o
    CC t/helper/test-hash-speed.o
    CC t/helper/test-hash.o
    CC t/helper/test-hashmap.o
    CC t/helper/test-index-version.o
    CC t/helper/test-json-writer.o
    CC t/helper/test-lazy-init-name-hash.o
    CC t/helper/test-match-trees.o
    CC t/helper/test-mergesort.o
    CC t/helper/test-mktemp.o
    CC t/helper/test-oid-array.o
    CC t/helper/test-oidmap.o
    CC t/helper/test-online-cpus.o
    CC t/helper/test-parse-options.o
    CC t/helper/test-parse-pathspec-file.o
    CC t/helper/test-path-utils.o
    CC t/helper/test-pkt-line.o
    CC t/helper/test-prio-queue.o
    CC t/helper/test-proc-receive.o
    CC t/helper/test-progress.o
    CC t/helper/test-reach.o
    CC t/helper/test-read-cache.o
    CC t/helper/test-read-graph.o
    CC t/helper/test-read-midx.o
    CC t/helper/test-ref-store.o
    CC t/helper/test-regex.o
    CC t/helper/test-repository.o
    CC t/helper/test-revision-walking.o
    CC t/helper/test-run-command.o
    CC t/helper/test-scrap-cache-tree.o
    CC t/helper/test-serve-v2.o
    CC t/helper/test-sha1.o
    CC t/helper/test-sha256.o
    CC t/helper/test-sigchain.o
    CC t/helper/test-strcmp-offset.o
    CC t/helper/test-string-list.o
    CC t/helper/test-submodule-config.o
    CC t/helper/test-submodule-nested-repo-config.o
    CC t/helper/test-subprocess.o
    CC t/helper/test-trace2.o
    CC t/helper/test-urlmatch-normalization.o
    CC t/helper/test-wildmatch.o
    CC t/helper/test-windows-named-pipe.o
    CC t/helper/test-write-cache.o
    CC t/helper/test-xml-encode.o
    LINK t/helper/test-tool
    GEN bin-wrappers/git
    GEN bin-wrappers/git-receive-pack
    GEN bin-wrappers/git-shell
    GEN bin-wrappers/git-upload-archive
    GEN bin-wrappers/git-upload-pack
    GEN bin-wrappers/git-cvsserver
    GEN bin-wrappers/test-fake-ssh
    GEN bin-wrappers/test-tool
    SUBDIR tests
ok 1 - extract Git version from Makefile
not ok 2 - test Git version matches Makefile
#	
#		( cat ../../git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) |
#		sed -e "s/GIT_VERSION[ 	]*=[ 	]*//" -e "s/\\.dirty$//" >git_version &&
#		sed -e "s/-/./g" makefile_version >makefile_git_version &&
#		test_cmp git_version makefile_git_version
#	
not ok 3 - test submodule version matches Makefile
#	
#		if ! test -e ../../git/.git
#		then
#			echo "git/ is not a Git repository" >&2
#		else
#			(
#				cd ../.. &&
#				sm_oid=$(git ls-files --stage -- git |
#					sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9]	.*$/\\1/") &&
#				cd git &&
#				git describe --match "v[0-9]*" $sm_oid
#			) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
#			test_cmp sm_version makefile_version
#		fi
#	
# failed 2 among 3 test(s)
1..3
make[1]: *** [Makefile:12: t0001-validate-git-versions.sh] Error 1
make: *** [Makefile:83: test] Error 2


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] git: update to v2.29.1
  2020-10-31  8:56 ` jean-christophe manciot
  2020-10-31  9:20   ` jean-christophe manciot
@ 2020-11-01 20:17   ` Christian Hesse
  2020-11-02  7:27     ` jean-christophe manciot
  1 sibling, 1 reply; 10+ messages in thread
From: Christian Hesse @ 2020-11-01 20:17 UTC (permalink / raw)
  To: jean-christophe manciot; +Cc: cgit, Christian Hesse

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

jean-christophe manciot <actionmystique@gmail.com> on Sat, 2020/10/31 09:56:
> not ok 3 - test submodule version matches Makefile

Did you run `git submodule update`?
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] git: update to v2.29.1
  2020-11-01 20:17   ` Christian Hesse
@ 2020-11-02  7:27     ` jean-christophe manciot
  2020-11-02  8:44       ` jean-christophe manciot
  0 siblings, 1 reply; 10+ messages in thread
From: jean-christophe manciot @ 2020-11-02  7:27 UTC (permalink / raw)
  To: Christian Hesse; +Cc: cgit, Christian Hesse

> Did you run `git submodule update`?

Yes, and I also tried to apply only this 'git: update to v2.29.1'
patch over v1.2.3-8-gadcc4f8 (without the other patches) and it fails
the same way, so all previous patches are not linked to this issue.
This is what I run before building:

# Resetting & cleaning
git reset --hard
git submodule deinit -f .
git submodule update --init
git clean -fxd :/
# Pulling with rebase
git pull -v --progress --rebase
# Updating Submodules
git submodule update --init --recursive
# Fetching Tags
git fetch --tags
# Checking out v1.2.3-8-gadcc4f8
git checkout -f $git_tag

I get this when updating submodules:
Submodule path 'git/sha1collisiondetection': checked out
'855827c583bc30645ba427885caa40c5b81764d2'

I also notice a strange 'warning: unable to rmdir 'git': Directory not
empty' while applying your patch.
--
Jean-Christophe

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] git: update to v2.29.1
  2020-11-02  7:27     ` jean-christophe manciot
@ 2020-11-02  8:44       ` jean-christophe manciot
  2020-11-02  9:24         ` Christian Hesse
  0 siblings, 1 reply; 10+ messages in thread
From: jean-christophe manciot @ 2020-11-02  8:44 UTC (permalink / raw)
  To: Christian Hesse; +Cc: cgit, Christian Hesse

[-- Attachment #1: Type: text/plain, Size: 1444 bytes --]

Even simpler by cloning into a new folder:

$ git clone https://git.zx2c4.com/cgit .
...
$ git submodule update --init --recursive
Submodule 'git' (https://git.kernel.org/pub/scm/git/git.git)
registered for path 'git'
Cloning into '/git-cgit/git'...
Submodule path 'git': checked out '69986e19ffcfb9af674ae5180689ab7bbf92ed28'
Submodule 'sha1collisiondetection'
(https://github.com/cr-marcstevens/sha1collisiondetection.git)
registered for path 'git/sha1collisiondetection'
Cloning into '/git-cgit/git/sha1collisiondetection'...
Submodule path 'git/sha1collisiondetection': checked out
'855827c583bc30645ba427885caa40c5b81764d2'

$ git apply --verbose --check ../0005-git2.29.1.patch
Checking patch Makefile...
Checking patch git...

$ git apply --verbose ../0005-git2.29.1.patch
Checking patch Makefile...
Checking patch git...
warning: unable to rmdir 'git': Directory not empty
Applied patch Makefile cleanly.
Applied patch git cleanly.

$ make
...
$ make test
...
    SUBDIR tests
ok 1 - extract Git version from Makefile
not ok 2 - test Git version matches Makefile
#
# ( cat ../../git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) |
# sed -e "s/GIT_VERSION[ ]*=[ ]*//" -e "s/\\.dirty$//" >git_version &&
# sed -e "s/-/./g" makefile_version >makefile_git_version &&
# test_cmp git_version makefile_git_version
#
not ok 3 - test submodule version matches Makefile
#
...
The patch is attached (copied from first post)
-- 
Jean-Christophe

[-- Attachment #2: 0005-git2.29.1.patch --]
[-- Type: text/x-patch, Size: 706 bytes --]

Signed-off-by: Christian Hesse <mail@eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c947b63..eb60388 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.29.0
+GIT_VER = 2.29.1
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index 69986e1..b927c80 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 69986e19ffcfb9af674ae5180689ab7bbf92ed28
+Subproject commit b927c80531cca9b9107754186532e8cb00884008
--

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] git: update to v2.29.1
  2020-11-02  8:44       ` jean-christophe manciot
@ 2020-11-02  9:24         ` Christian Hesse
  2020-11-04 13:55           ` jean-christophe manciot
  0 siblings, 1 reply; 10+ messages in thread
From: Christian Hesse @ 2020-11-02  9:24 UTC (permalink / raw)
  To: jean-christophe manciot; +Cc: cgit, Christian Hesse

[-- Attachment #1: Type: text/plain, Size: 1977 bytes --]

jean-christophe manciot <actionmystique@gmail.com> on Mon, 2020/11/02 09:44:
> Even simpler by cloning into a new folder:
> 
> $ git clone https://git.zx2c4.com/cgit .
> ...
> $ git submodule update --init --recursive
> Submodule 'git' (https://git.kernel.org/pub/scm/git/git.git)
> registered for path 'git'
> Cloning into '/git-cgit/git'...
> Submodule path 'git': checked out '69986e19ffcfb9af674ae5180689ab7bbf92ed28'
> Submodule 'sha1collisiondetection'
> (https://github.com/cr-marcstevens/sha1collisiondetection.git)
> registered for path 'git/sha1collisiondetection'
> Cloning into '/git-cgit/git/sha1collisiondetection'...
> Submodule path 'git/sha1collisiondetection': checked out
> '855827c583bc30645ba427885caa40c5b81764d2'
> 
> $ git apply --verbose --check ../0005-git2.29.1.patch
> Checking patch Makefile...
> Checking patch git...
> 
> $ git apply --verbose ../0005-git2.29.1.patch
> Checking patch Makefile...
> Checking patch git...
> warning: unable to rmdir 'git': Directory not empty
> Applied patch Makefile cleanly.
> Applied patch git cleanly.

What does `git -C git describe --long` give here?
I guess it's time to run `git submodule update`.

> $ make
> ...
> $ make test
> ...
>     SUBDIR tests
> ok 1 - extract Git version from Makefile
> not ok 2 - test Git version matches Makefile
> #
> # ( cat ../../git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) |
> # sed -e "s/GIT_VERSION[ ]*=[ ]*//" -e "s/\\.dirty$//" >git_version &&
> # sed -e "s/-/./g" makefile_version >makefile_git_version &&
> # test_cmp git_version makefile_git_version
> #
> not ok 3 - test submodule version matches Makefile
> #
> ...
> The patch is attached (copied from first post)



-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] git: update to v2.29.1
  2020-11-02  9:24         ` Christian Hesse
@ 2020-11-04 13:55           ` jean-christophe manciot
  2020-11-04 14:10             ` Christian Hesse
  0 siblings, 1 reply; 10+ messages in thread
From: jean-christophe manciot @ 2020-11-04 13:55 UTC (permalink / raw)
  To: Christian Hesse; +Cc: cgit, Christian Hesse

> What does `git -C git describe --long` give here?
$ git -C git describe --long
v2.29.0-0-g69986e19ff
and also:
$ git -C git tag --list|grep v2.29|grep -v rc
v2.29.0
v2.29.1
v2.29.2
> I guess it's time to run `git submodule update`.
There's nothing more you can expect with that command now; you've
probably missed the previous 'git submodule update --init
--recursive':
$ git submodule update
$ git -C git describe --long
v2.29.0-0-g69986e19ff
$ git -C git tag --list|grep v2.29|grep -v rc
v2.29.0
v2.29.1
v2.29.2

As you can see, nothing has changed, so the issue is still there.
--
Jean-Christophe

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] git: update to v2.29.1
  2020-11-04 13:55           ` jean-christophe manciot
@ 2020-11-04 14:10             ` Christian Hesse
  2020-11-04 15:05               ` jean-christophe manciot
  0 siblings, 1 reply; 10+ messages in thread
From: Christian Hesse @ 2020-11-04 14:10 UTC (permalink / raw)
  To: jean-christophe manciot; +Cc: cgit, Christian Hesse

[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]

jean-christophe manciot <actionmystique@gmail.com> on Wed, 2020/11/04 14:55:
> > What does `git -C git describe --long` give here?  
> $ git -C git describe --long
> v2.29.0-0-g69986e19ff
> and also:
> $ git -C git tag --list|grep v2.29|grep -v rc
> v2.29.0
> v2.29.1
> v2.29.2
> > I guess it's time to run `git submodule update`.  
> There's nothing more you can expect with that command now; you've
> probably missed the previous 'git submodule update --init
> --recursive':
> $ git submodule update
> $ git -C git describe --long
> v2.29.0-0-g69986e19ff
> $ git -C git tag --list|grep v2.29|grep -v rc
> v2.29.0
> v2.29.1
> v2.29.2
> 
> As you can see, nothing has changed, so the issue is still there.

Ah, missed another detail: You use `git apply`, not `git am`. Your changes
are applied, but not committed. With `git submodule update` you check out the
version of submodule that has been committed.

So commit your changes (or use `git am`) and you should be fine.
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/1] git: update to v2.29.1
  2020-11-04 14:10             ` Christian Hesse
@ 2020-11-04 15:05               ` jean-christophe manciot
  0 siblings, 0 replies; 10+ messages in thread
From: jean-christophe manciot @ 2020-11-04 15:05 UTC (permalink / raw)
  To: Christian Hesse; +Cc: cgit, Christian Hesse

Ok, thanks.
-- 
Jean-Christophe

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-11-04 15:05 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-27  9:42 [PATCH 1/1] git: update to v2.29.1 Christian Hesse
2020-10-31  8:56 ` jean-christophe manciot
2020-10-31  9:20   ` jean-christophe manciot
2020-11-01 20:17   ` Christian Hesse
2020-11-02  7:27     ` jean-christophe manciot
2020-11-02  8:44       ` jean-christophe manciot
2020-11-02  9:24         ` Christian Hesse
2020-11-04 13:55           ` jean-christophe manciot
2020-11-04 14:10             ` Christian Hesse
2020-11-04 15:05               ` jean-christophe manciot

List for cgit developers and users

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/cgit

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 cgit cgit/ http://inbox.vuxu.org/cgit \
		cgit@lists.zx2c4.com
	public-inbox-index cgit

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.archive.cgit


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git