From: "Ludovic Courtès" <ludo@gnu.org>
To: zimoun <zimon.toutoune@gmail.com>
Cc: 41604@debbugs.gnu.org, John Soo <jsoo1@asu.edu>
Subject: bug#41604: guix pull impossible after rebasing a local repository
Date: Fri, 05 Jun 2020 18:17:51 +0200 [thread overview]
Message-ID: <87h7vp32s0.fsf@gnu.org> (raw)
In-Reply-To: <CAJ3okZ3wEbUWYVdu5q5LUCJM9QKeomUiihHAiHH985r0xLdr+Q@mail.gmail.com> (zimoun's message of "Fri, 5 Jun 2020 03:23:20 +0200")
Hi Simon,
zimoun <zimon.toutoune@gmail.com> skribis:
> $ guix describe
> Generation 37 Jun 05 2020 01:28:52 (current)
> guix 8bd0b53
> repository URL: https://git.savannah.gnu.org/git/guix.git
> commit: 8bd0b533b30d7ee5e03aee99a2eb96d5b0b1c836
>
> $ echo hello >> $SRC/README && git -C $SRC commit -am hello
> [master 09f6e9b34c] hello
> 1 file changed, 1 insertion(+)
>
> $ guix pull --commit=$(git -C $SRC rev-parse HEAD)
> Updating channel 'guix' from Git repository at
> 'https://git.savannah.gnu.org/git/guix.git'...
> Building from this channel:
> guix https://git.savannah.gnu.org/git/guix.git 09f6e9b
> Computing Guix derivation for 'x86_64-linux'... /
>
> $ guix describe
> Generation 38 Jun 05 2020 02:57:13 (current)
> guix 09f6e9b
> repository URL: https://git.savannah.gnu.org/git/guix.git
> commit: 09f6e9b34c6239bcdd8ca9e030d698b5244507a6
>
> $ git -C $SRC reset --hard HEAD^
> HEAD is now at 8bd0b533b3 gnu: libexif: Update to 0.6.22 [security fixes].
>
> $ git -C $SRC reflog expire --expire-unreachable=now --all
> $ git -C $SRC gc --prune=now --quiet
> $ git -C $SRC show 09f6e9b34c6239bcdd8ca9e030d698b5244507a6
> fatal: bad object 09f6e9b34c6239bcdd8ca9e030d698b5244507a6
>
> $ guix pull --commit=e451612602 --allow-downgrades
> Updating channel 'guix' from Git repository at
> 'https://git.savannah.gnu.org/git/guix.git'...
> guix pull: error: Git error: object not found - no match for id
> (09f6e9b34c6239bcdd8ca9e030d698b5244507a6)
Ah I see, thanks for the reproducer.
Generally, rebasing does not necessarily implies ‘git gc’, so I think
one has to be unlucky to have the former commit disappear right away,
no?
But yeah, I don’t think there’s much we can do. Or perhaps we could
have ‘commit-relation’ report 'unrelated when one of the commits does
not exist, that’d be clearer and more useful than this error.
WDYT?
Ludo’.
next prev parent reply other threads:[~2020-06-05 16:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 16:38 bug#41604: guix pull impossible after rebasing a local repository John Soo
[not found] ` <handler.41604.B.159077032116756.ack@debbugs.gnu.org>
2020-05-29 16:41 ` bug#41604: Acknowledgement (guix pull impossible after rebasing a local repository) John Soo
2020-05-29 16:52 ` bug#41604: guix pull impossible after rebasing a local repository zimoun
2020-05-29 17:10 ` John Soo
2020-05-29 17:44 ` zimoun
2020-05-29 18:22 ` John Soo
2020-05-29 18:39 ` zimoun
2020-05-30 2:26 ` John Soo
2020-05-30 10:45 ` zimoun
2020-05-30 16:18 ` Arne Babenhauserheide
2020-05-31 5:04 ` John Soo
2020-06-01 16:48 ` zimoun
2020-06-01 17:28 ` John Soo
2020-06-01 16:35 ` zimoun
2020-06-03 9:28 ` Ludovic Courtès
2020-06-03 13:44 ` John Soo
2020-06-03 15:13 ` Ludovic Courtès
2020-06-04 14:11 ` John Soo
2020-06-05 1:44 ` zimoun
2020-06-05 16:13 ` Ludovic Courtès
2020-06-05 1:23 ` zimoun
2020-06-05 16:17 ` Ludovic Courtès [this message]
2020-06-05 17:51 ` zimoun
2020-06-07 21:16 ` Ludovic Courtès
2020-06-07 22:25 ` zimoun
2020-06-07 23:52 ` John Soo
2020-06-10 14:51 ` Ludovic Courtès
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h7vp32s0.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=41604@debbugs.gnu.org \
--cc=jsoo1@asu.edu \
--cc=zimon.toutoune@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).