Re: git refs migrate does not migrate stash entries

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



"brian m. carlson" <sandals@xxxxxxxxxxxxxxxxxxxx> writes:

> After the recent fix for reflog migrations posted to the list, I
> converted two work repositories. Unfortunately, it doesn't appear as
> though the reflog for `refs/stash` was converted, so I think I may have
> lost my stashes.  While I would have liked to retain them, fortunately
> they were not essential in these repos and I can live without them, but
> we probably do want to fix this issue since users in general will want
> to maintain them.
>
> Here's a shell script that reproduces the problem on the latest `next`:
> ----
> #!/bin/sh -e
>
> rm -fr test-repo
> git version
> git init -b dev test-repo
> cd test-repo
> touch abc.txt
> git add abc.txt
> git commit -m +
> echo abc >abc.txt
> git stash
> git show stash@{0}
> git stash list -p
>
> echo "Converting..."
> git refs migrate --ref-format=reftable
>
> echo "Now using reftable."
>
> git stash show
> git show stash@{0}
> git stash list -p
> ----
>

Confirming that I can also reproduce the issue.

> My expectation is that the script exits 0 and prints the stashes a
> second time, but it exits early and unsuccessfully and the stashes don't
> appear to be preserved.  It does appear to work correctly if you comment
> out the `git refs migrate` command.
>
> I would have liked to have done more investigation, but I'm dealing with
> some administrivia in my personal life that has taken up more of my
> evenings than I would have liked, so I have not done so.
>

I didn't investigate it yet, over the top, it seems like the reflog is
migrated, however the detection and display doesn't work for some reason:

  $ git for-each-ref --include-root-refs
  0652ae7d444e73ed8bee7ca7a0b66e4413386297 commit	HEAD
  0652ae7d444e73ed8bee7ca7a0b66e4413386297 commit	ORIG_HEAD
  0652ae7d444e73ed8bee7ca7a0b66e4413386297 commit	refs/heads/dev
  2652bce3ffc3769feb7eca552d3dbe27ff901aaf commit	refs/stash

I will spend time on this week.

> I also apologize for sending a constant barrage of bug reports that
> might make it seem like I'm dissatisfied with the work on reftable, when
> in fact that's not the case and I do very much appreciate the work being
> done.  I did promise Patrick that I'd try it out and be the guinea pig,
> and so I'm doing so.  I'm excited to see it end up in its final state.
> --

If anything, this is really useful and I really appreciate you putting
efforts to report these bugs. This helps us improve the bridge and also
helps the community overall.

Thanks for your work!

> brian m. carlson (they/them or he/him)
> Toronto, Ontario, CA

Attachment: signature.asc
Description: PGP signature


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux