From: Klaus Ethgen <Klaus@Ethgen.ch>
To: git@vger.kernel.org
Subject: Bug when pulling subtree changes
Date: Wed, 1 Jul 2020 09:43:10 +0100 [thread overview]
Message-ID: <20200701084310.GC7618@ikki.ethgen.ch> (raw)
[-- Attachment #1: Type: text/plain, Size: 1793 bytes --]
Hello,
currently I suffer of a strange bug with subtree.
Long ago, I did the following:
git subtree add --prefix=stdlib https://github.com/puppetlabs/puppetlabs-stdlib 4.12.0
git subtree pull --squash --prefix=stdlib https://github.com/puppetlabs/puppetlabs-stdlib 4.19.0
git subtree pull --squash --prefix=stdlib https://github.com/puppetlabs/puppetlabs-stdlib 4.20.0
Today I wanted to do the following:
git subtree pull --squash --prefix=stdlib https://github.com/puppetlabs/puppetlabs-stdlib v6.3.0
But got the following error:
From https://github.com/puppetlabs/puppetlabs-stdlib
* tag v6.3.0 -> FETCH_HEAD
fatal: ambiguous argument '3a4414eb087da0dafa147df047f6bf8f18a6a621^0': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
could not rev-parse split hash 3a4414eb087da0dafa147df047f6bf8f18a6a621 from commit c1118a27ef27c1fd4df7877f0b0fb606ea30f0fd
Can't squash-merge: 'stdlib' was never added.
The revisions are fully valid:
- c1118a27ef27c1fd4df7877f0b0fb606ea30f0fd: The last squash revision in
the private repository
- 3a4414eb087da0dafa147df047f6bf8f18a6a621: Tag 4.20.0 in
puppetlabs-stdlib repository
- Tag v6.3.0 pointing to 990cd99 in puppetlabs-stdlib repository
The current git version is 2.27.0. I have no record about the revision
used for the pulls in past.
Anyone an idea why this doesn't work anymore?
Please keep me in Cc as I am not subscribed to the mailing list.
Regards
Klaus
--
Klaus Ethgen http://www.ethgen.ch/
pub 4096R/4E20AF1C 2011-05-16 Klaus Ethgen <Klaus@Ethgen.ch>
Fingerprint: 85D4 CA42 952C 949B 1753 62B3 79D0 B06F 4E20 AF1C
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 688 bytes --]
reply other threads:[~2020-07-01 9:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200701084310.GC7618@ikki.ethgen.ch \
--to=klaus@ethgen.ch \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).