`git move -x` leads to commit disappearing (branchless: Failed to process reference transaction!)

Question

`git move -x` leads to commit disappearing (branchless: Failed to process reference transaction!)

tiptenbrink opened this issue 6 months ago · comments

Description of the bug

Probably I did something stupid (I've only been using this tool for a few weeks), but here's what happened:

I initialized git-branchless as I was using a new computer
I had a branch with some commits I wanted to move to a different location
So I used git move -x <commit hash>. This led to the following output:

git move -x 2af5d7e
Attempting rebase in-memory...
[1/4] Committed as: 9f1cde7 made deprecated res/profile refer to new router function
[2/4] Committed as: 77a43fe fix: authpage no longer submits when pressing forgot password
[3/4] Committed as: 5140268 logging for update password
[4/4] Committed as: 2b10a6d add logging for getting birthday, profile and change email, onboard
/c/Users/Student/Documents/GitHub/backend/.git/hooks/reference-transaction: line 6: git: command not found
branchless: Failed to process reference transaction!
branchless: Some events (e.g. branch updates) may have been lost.
branchless: This is a bug. Please report it.
/c/Users/Student/Documents/GitHub/backend/.git/hooks/post-rewrite: line 4: git: command not found
branchless: creating working copy snapshot
branchless: running command: git checkout main
Your branch is up to date with 'origin/main'.
Switched to branch 'main'
branchless: processing checkout

For reference, this was my git sl before:

◇ 01bbc15 4d fix: revert changing category to primary_key, was not supposed to be committed
┣━┓
⋮ ◯ 6e90a80 4d feat: Dodeka logo and improve alignment
⋮ ┃
⋮ ◯ 9d482d6 3h remove gunicorn.sh as no longer used
⋮ ┃
⋮ ◯ cb38414 10m fix: default eduinstitution now set
⋮ ┃
⋮ ◯ 2af5d7e 10m add logging for getting birthday, profile and change email, onboard
⋮ ┃
⋮ ◯ 6028c90 10m made deprecated res/profile refer to new router function
⋮ ┃
⋮ ◯ abf0d0f 10m fix: authpage no longer submits when pressing forgot password
⋮ ┃
⋮ ◯ 7da0aa3 10m (improve-authpage) logging for update password
⋮
◆ d9b20d8 5m (chore/more-logging, ᐅ main) remove gunicorn.sh as no longer used

After:

◇ 01bbc15 4d fix: revert changing category to primary_key, was not supposed to be committed
┣━┓
⋮ ◯ 6e90a80 4d feat: Dodeka logo and improve alignment
⋮ ┃
⋮ ◯ 9d482d6 3h remove gunicorn.sh as no longer used
⋮ ┃
⋮ ◯ cb38414 11m fix: default eduinstitution now set
⋮ ┃
⋮ ◯ 9f1cde7 1s made deprecated res/profile refer to new router function
⋮ ┃
⋮ ◯ 77a43fe 1s fix: authpage no longer submits when pressing forgot password
⋮ ┃
⋮ ◯ 5140268 1s (improve-authpage) logging for update password
⋮
◆ d9b20d8 5m (chore/more-logging, ᐅ main) remove gunicorn.sh as no longer used

git-branchless was installed using cargo install, using v0.8. I just updated Git to 2.43. The commit I moved, 2af5d7e was invisible. Running git undo changed nothing:

Will apply these actions:
1. Check out from d9b20d8 remove gunicorn.sh as no longer used
               to d9b20d8 remove gunicorn.sh as no longer used
2. Restore snapshot for d9b20d8 remove gunicorn.sh as no longer used
        backed up using dd7cee0 branchless: automated working copy snapshot
Confirm? [yN] y
branchless: creating working copy snapshot
branchless: running command: git checkout dd7cee0df4fa8194f1cfd8c366910d7913885aa7
Previous HEAD position was d9b20d8 remove gunicorn.sh as no longer used
branchless: processing 1 update: ref HEAD
HEAD is now at dd7cee0 branchless: automated working copy snapshot
branchless: processing checkout
branchless: restoring from snapshot
branchless: running command: git reset --hard HEAD
branchless: processing 1 update: ref HEAD
HEAD is now at dd7cee0 branchless: automated working copy snapshot
branchless: running command: git checkout 3e5d6fe3a882f2e53562104be6494f71d1cbd10b
Warning: you are leaving 5 commits behind, not connected to
any of your branches:
  dd7cee0 branchless: automated working copy snapshot                                                                                                                 
  4ebbb86 branchless: working copy snapshot data: 0 changes in stage 0
  7f8636f branchless: working copy snapshot data: 0 changes in stage 1
  64a91eb branchless: working copy snapshot data: 0 changes in stage 2
  8b98943 branchless: working copy snapshot data: 0 changes in stage 3
branchless: processing 1 update: ref HEAD
HEAD is now at 3e5d6fe branchless: working copy snapshot data: 0 unstaged changes
branchless: processing checkout
branchless: running command: git reset d9b20d80e7e4988260eaa166753778fb475df55f
branchless: processing 1 update: ref HEAD
⋮
◇ 01bbc15 4d fix: revert changing category to primary_key, was not supposed to be committed
┣━┓
⋮ ◯ 6e90a80 4d feat: Dodeka logo and improve alignment
⋮ ┃
⋮ ◯ 9d482d6 3h remove gunicorn.sh as no longer used
⋮ ┃
⋮ ◯ cb38414 12m fix: default eduinstitution now set
⋮ ┃
⋮ ◯ 9f1cde7 1m made deprecated res/profile refer to new router function
⋮ ┃
⋮ ◯ 77a43fe 1m fix: authpage no longer submits when pressing forgot password
⋮ ┃
⋮ ◯ 5140268 1m (improve-authpage) logging for update password
⋮
◆ d9b20d8 7m (chore/more-logging, main) remove gunicorn.sh as no longer used

Using git unhide I was able to restore the commit:

◇ 01bbc15 4d fix: revert changing category to primary_key, was not supposed to be committed
┣━┓
⋮ ◯ 6e90a80 4d feat: Dodeka logo and improve alignment
⋮ ┃
⋮ ◯ 9d482d6 4h remove gunicorn.sh as no longer used
⋮ ┃
⋮ ◯ cb38414 16m fix: default eduinstitution now set
⋮ ┣━┓
⋮ ┃ ◯ 2af5d7e 16m add logging for getting birthday, profile and change email, onboard
⋮ ┃
⋮ ◯ 9f1cde7 5m made deprecated res/profile refer to new router function
⋮ ┃
⋮ ◯ 77a43fe 5m fix: authpage no longer submits when pressing forgot password
⋮ ┃
⋮ ◯ 5140268 5m (improve-authpage) logging for update password
⋮
◆ d9b20d8 11m (chore/more-logging, main) remove gunicorn.sh as no longer used

I'm aware that doing something similar is used to remove commits from a branch, but I was under the impression that they should be visible somewhere at least? Also because of the error indicated, I believe something is going wrong. My apologies if I'm misunderstanding the commands.

Also, thanks a lot for this tool! I'm slowly migrating to a more branchless/stacking workflow, but as you can see sometimes I still rely on my old trusted branches.

Expected behavior

Commit was moved on top of HEAD (main branch in this case) and removed from the list of commits on the other branch. Commit doesn't disappear, git-branchless doesn't give an error.

Actual behavior

Commit was hidden.

Version of `rustc`

1.73.0

Automated bug report

Software version

git-branchless 0.8.0

Operating system

Windows 6.2.9200

Command-line

git-branchless bug-report

Environment variables

SHELL=<not set>
EDITOR=<not set>

Git version

> git version
git version 2.43.0.windows.1

Hooks

Show 7 hooks

Hook `post-applypatch`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-applypatch "$@"

## END BRANCHLESS CONFIG

Hook `post-checkout`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-checkout "$@"

## END BRANCHLESS CONFIG

Hook `post-commit`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-commit "$@"

## END BRANCHLESS CONFIG

Hook `post-merge`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-merge "$@"

## END BRANCHLESS CONFIG

Hook `post-rewrite`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-rewrite "$@"

## END BRANCHLESS CONFIG

Hook `pre-auto-gc`

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook pre-auto-gc "$@"

## END BRANCHLESS CONFIG

Hook `reference-transaction`

#!/bin/sh
## START BRANCHLESS CONFIG

# Avoid canceling the reference transaction in the case that `branchless` fails
# for whatever reason.
git branchless hook reference-transaction "$@" || (
echo 'branchless: Failed to process reference transaction!'
echo 'branchless: Some events (e.g. branch updates) may have been lost.'
echo 'branchless: This is a bug. Please report it.'
)

## END BRANCHLESS CONFIG

Events

Show 5 events

Event ID: 37, transaction ID: 24 (message: unhide)

UnobsoleteEvent { timestamp: 1701606761.9774282, event_tx_id: EventTransactionId(24), commit_oid: NonZeroOid(2af5d7e0a6426b3eaa6cda3701555b763f4568bf) }

:
O da56717 258d xxxx xxxx xxxxx
|\
: o ec7bff6 254d (redacted-ref-0) xxxxxx xxxx
:
O 41f217a 75d (redacted-ref-1) xxxx xxx xxxx xx xxxxx
:
O b4de865 59d xxxxxx xxx xxxxx xxxxx
|\
: o 566ac90 59d (redacted-ref-2) xxxx xxxxxxxxx xxx xxxx
:
O c4a74e0 28d (redacted-ref-3) xxxx xxx xxxxxxxxx xxx xxxxxxx xxxx xxxx xxxxxxxxxx xxx xxxx xxx xxx xxxx
:
O 2ae7c32 28d (redacted-ref-4) xxxxx xxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xxxx xxxx xxxxxxx xxxx
:
O 53fbd66 26d (redacted-ref-5) xxxxxx xxxxx xxxxxx xxx xxxx xxxxxxxxxx
:
O c88160a 26d xxxxx xxxx xxxxxxx xxx xxxx xxxxxxxxxxxxxxxxxx
|\
| o 6c1960f 26d xxxxx xxxxx xxxx xxxxx xxxx
| |
| o 7624998 25d xxxxx xxx xxxxxxxxxxx
| |
| o 8dfbbc6 25d xxxx xxxx xxxxx xxxxxxx xxx xxxxx
| |
| o 90fbfaa 25d xxx xxxxx xxxx
| |
| o 4c2f136 25d xxxx xxxx xxx xxx xxxxx xxxx
| |
| o 898bdc9 25d xxxx xxxxxx xx
| |
| o 02407ec 25d xxxxx xxxxxx xxxxxx
| |
| o fe949e3 25d xxxx xxxxx xx xxxxxx xx xxxxxxx xxxx
| |
| o 00139fc 25d xxxx xxxxxxxxx xxxx xx xxxxxx
| |
| o 7848514 25d xxxxxx xxxxxx
| |
| o 8be9311 25d xxxx xxxxx xxxx xxxxxx xxxxx
| |
| o 014b13a 25d (redacted-ref-6) xxxxxxxx
|
O d12c188 25d xxxxx xxxx xxxxx
|\
: o e108478 25d xxxxx xxxxxx xxxxxxxxxxxxxx
: |
: o f7af8f9 25d xxxx xxxx
: |
: o 2e2b044 25d xxxx xxxx xxxx xxxxxxx
: |
: o b6e474c 25d xxxxxx xxxx xxxxxx xxxxxx xxxx xxxx xx xxxx xxxx xxxxx xx xx
: |
: o 48dc8b5 25d xxxx xxxxxx xxxxxx xxxxxxxx xx xxxx
: |
: o a3f5b28 25d xxxx xxxxxxxx xxxxxx xx
: |
: o ca2fe47 25d xxxx xxx xxxxxx xxxxx xxxxx
: |
: o 6cbec51 25d xxxx xxxxxx xxxxx
: |
: o b1cad43 25d xxxx xxxxxx xxxxx xxxxx
: |
: o 56b56d9 25d xxxxx xxxx xxxx xx xxxxxx
: |
: o 0b850a8 25d xxxxx xxx xx xx xxx xxx xx
: |
: o f08112a 25d xxxx xxxx xxxxxx xxxx xxx xxxx xxxxxxxxx
: |
: o 61f71fb 24d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxxxxxx xxxx
:
O 68491a7 23d (redacted-ref-8) xxxxxxxxx xxxx xxxxxxx
:
O 01bbc15 4d xxxx xxxxxx xxxxxxxx xxxxxxxx xx xxxxxxxxxxxx xxx xxx xxxxxxxx xx xx xxxxxxxxx
|\
: o 6e90a80 4d xxxxx xxxxxx xxxx xxx xxxxxxx xxxxxxxxx
: |
: o 9d482d6 4h xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx
: |
: o cb38414 26m xxxx xxxxxxx xxxxxxxxxxxxxx xxx xxx
: |\
: | o 2af5d7e 26m xxx xxxxxxx xxx xxxxxxx xxxxxxxxx xxxxxxx xxx xxxxxx xxxxxx xxxxxxx
: |
: o 9f1cde7 15m xxxx xxxxxxxxxx xxxxxxxxxxx xxxxx xx xxx xxxxxx xxxxxxxx
: |
: o 77a43fe 15m xxxx xxxxxxxx xx xxxxxx xxxxxxx xxxx xxxxxxxx xxxxxx xxxxxxxx
: |
: o 5140268 15m (redacted-ref-9) xxxxxxx xxx xxxxxx xxxxxxxx
:
@ d9b20d8 21m (main, redacted-ref-10) xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx

Event ID: 30, transaction ID: 22 (message: undo)

WorkingCopySnapshot { timestamp: 1701606651.5180635, event_tx_id: EventTransactionId(22), head_oid: d9b20d80e7e4988260eaa166753778fb475df55f, commit_oid: NonZeroOid(dd7cee0df4fa8194f1cfd8c366910d7913885aa7), ref_name: None }
RefUpdateEvent { timestamp: 1701606651.7743325, event_tx_id: EventTransactionId(22), ref_name: ReferenceName("HEAD"), old_oid: 0000000000000000000000000000000000000000, new_oid: dd7cee0df4fa8194f1cfd8c366910d7913885aa7, message: None }
RefUpdateEvent { timestamp: 1701606651.8856702, event_tx_id: EventTransactionId(22), ref_name: ReferenceName("HEAD"), old_oid: d9b20d80e7e4988260eaa166753778fb475df55f, new_oid: dd7cee0df4fa8194f1cfd8c366910d7913885aa7, message: None }
RefUpdateEvent { timestamp: 1701606652.3215134, event_tx_id: EventTransactionId(22), ref_name: ReferenceName("HEAD"), old_oid: dd7cee0df4fa8194f1cfd8c366910d7913885aa7, new_oid: dd7cee0df4fa8194f1cfd8c366910d7913885aa7, message: None }
RefUpdateEvent { timestamp: 1701606652.6007488, event_tx_id: EventTransactionId(22), ref_name: ReferenceName("HEAD"), old_oid: 0000000000000000000000000000000000000000, new_oid: 3e5d6fe3a882f2e53562104be6494f71d1cbd10b, message: None }
RefUpdateEvent { timestamp: 1701606652.728975, event_tx_id: EventTransactionId(22), ref_name: ReferenceName("HEAD"), old_oid: dd7cee0df4fa8194f1cfd8c366910d7913885aa7, new_oid: 3e5d6fe3a882f2e53562104be6494f71d1cbd10b, message: None }
RefUpdateEvent { timestamp: 1701606653.1773174, event_tx_id: EventTransactionId(22), ref_name: ReferenceName("HEAD"), old_oid: 3e5d6fe3a882f2e53562104be6494f71d1cbd10b, new_oid: d9b20d80e7e4988260eaa166753778fb475df55f, message: None }

:
O da56717 258d xxxx xxxx xxxxx
|\
: o ec7bff6 254d (redacted-ref-0) xxxxxx xxxx
:
O 41f217a 75d (redacted-ref-1) xxxx xxx xxxx xx xxxxx
:
O b4de865 59d xxxxxx xxx xxxxx xxxxx
|\
: o 566ac90 59d (redacted-ref-2) xxxx xxxxxxxxx xxx xxxx
:
O c4a74e0 28d (redacted-ref-3) xxxx xxx xxxxxxxxx xxx xxxxxxx xxxx xxxx xxxxxxxxxx xxx xxxx xxx xxx xxxx
:
O 2ae7c32 28d (redacted-ref-4) xxxxx xxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xxxx xxxx xxxxxxx xxxx
:
O 53fbd66 26d (redacted-ref-5) xxxxxx xxxxx xxxxxx xxx xxxx xxxxxxxxxx
:
O c88160a 26d xxxxx xxxx xxxxxxx xxx xxxx xxxxxxxxxxxxxxxxxx
|\
| o 6c1960f 26d xxxxx xxxxx xxxx xxxxx xxxx
| |
| o 7624998 25d xxxxx xxx xxxxxxxxxxx
| |
| o 8dfbbc6 25d xxxx xxxx xxxxx xxxxxxx xxx xxxxx
| |
| o 90fbfaa 25d xxx xxxxx xxxx
| |
| o 4c2f136 25d xxxx xxxx xxx xxx xxxxx xxxx
| |
| o 898bdc9 25d xxxx xxxxxx xx
| |
| o 02407ec 25d xxxxx xxxxxx xxxxxx
| |
| o fe949e3 25d xxxx xxxxx xx xxxxxx xx xxxxxxx xxxx
| |
| o 00139fc 25d xxxx xxxxxxxxx xxxx xx xxxxxx
| |
| o 7848514 25d xxxxxx xxxxxx
| |
| o 8be9311 25d xxxx xxxxx xxxx xxxxxx xxxxx
| |
| o 014b13a 25d (redacted-ref-6) xxxxxxxx
|
O d12c188 25d xxxxx xxxx xxxxx
|\
: o e108478 25d xxxxx xxxxxx xxxxxxxxxxxxxx
: |
: o f7af8f9 25d xxxx xxxx
: |
: o 2e2b044 25d xxxx xxxx xxxx xxxxxxx
: |
: o b6e474c 25d xxxxxx xxxx xxxxxx xxxxxx xxxx xxxx xx xxxx xxxx xxxxx xx xx
: |
: o 48dc8b5 25d xxxx xxxxxx xxxxxx xxxxxxxx xx xxxx
: |
: o a3f5b28 25d xxxx xxxxxxxx xxxxxx xx
: |
: o ca2fe47 25d xxxx xxx xxxxxx xxxxx xxxxx
: |
: o 6cbec51 25d xxxx xxxxxx xxxxx
: |
: o b1cad43 25d xxxx xxxxxx xxxxx xxxxx
: |
: o 56b56d9 25d xxxxx xxxx xxxx xx xxxxxx
: |
: o 0b850a8 25d xxxxx xxx xx xx xxx xxx xx
: |
: o f08112a 25d xxxx xxxx xxxxxx xxxx xxx xxxx xxxxxxxxx
: |
: o 61f71fb 24d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxxxxxx xxxx
:
O 68491a7 23d (redacted-ref-8) xxxxxxxxx xxxx xxxxxxx
:
O 01bbc15 4d xxxx xxxxxx xxxxxxxx xxxxxxxx xx xxxxxxxxxxxx xxx xxx xxxxxxxx xx xx xxxxxxxxx
|\
: o 6e90a80 4d xxxxx xxxxxx xxxx xxx xxxxxxx xxxxxxxxx
: |
: o 9d482d6 4h xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx
: |
: o cb38414 26m xxxx xxxxxxx xxxxxxxxxxxxxx xxx xxx
: |\
: | o 2af5d7e 26m xxx xxxxxxx xxx xxxxxxx xxxxxxxxx xxxxxxx xxx xxxxxx xxxxxx xxxxxxx
: |
: o 9f1cde7 15m xxxx xxxxxxxxxx xxxxxxxxxxx xxxxx xx xxx xxxxxx xxxxxxxx
: |
: o 77a43fe 15m xxxx xxxxxxxx xx xxxxxx xxxxxxx xxxx xxxxxxxx xxxxxx xxxxxxxx
: |
: o 5140268 15m (redacted-ref-9) xxxxxxx xxx xxxxxx xxxxxxxx
:
@ d9b20d8 21m (main, redacted-ref-10) xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx

Event ID: 28, transaction ID: 21 (message: move)

WorkingCopySnapshot { timestamp: 1701606577.3682947, event_tx_id: EventTransactionId(21), head_oid: d9b20d80e7e4988260eaa166753778fb475df55f, commit_oid: NonZeroOid(dd7cee0df4fa8194f1cfd8c366910d7913885aa7), ref_name: None }
RefUpdateEvent { timestamp: 1701606577.5194192, event_tx_id: EventTransactionId(21), ref_name: ReferenceName("HEAD"), old_oid: d9b20d80e7e4988260eaa166753778fb475df55f, new_oid: d9b20d80e7e4988260eaa166753778fb475df55f, message: None }

:
O da56717 258d xxxx xxxx xxxxx
|\
: o ec7bff6 254d (redacted-ref-0) xxxxxx xxxx
:
O 41f217a 75d (redacted-ref-1) xxxx xxx xxxx xx xxxxx
:
O b4de865 59d xxxxxx xxx xxxxx xxxxx
|\
: o 566ac90 59d (redacted-ref-2) xxxx xxxxxxxxx xxx xxxx
:
O c4a74e0 28d (redacted-ref-3) xxxx xxx xxxxxxxxx xxx xxxxxxx xxxx xxxx xxxxxxxxxx xxx xxxx xxx xxx xxxx
:
O 2ae7c32 28d (redacted-ref-4) xxxxx xxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xxxx xxxx xxxxxxx xxxx
:
O 53fbd66 26d (redacted-ref-5) xxxxxx xxxxx xxxxxx xxx xxxx xxxxxxxxxx
:
O c88160a 26d xxxxx xxxx xxxxxxx xxx xxxx xxxxxxxxxxxxxxxxxx
|\
| o 6c1960f 26d xxxxx xxxxx xxxx xxxxx xxxx
| |
| o 7624998 25d xxxxx xxx xxxxxxxxxxx
| |
| o 8dfbbc6 25d xxxx xxxx xxxxx xxxxxxx xxx xxxxx
| |
| o 90fbfaa 25d xxx xxxxx xxxx
| |
| o 4c2f136 25d xxxx xxxx xxx xxx xxxxx xxxx
| |
| o 898bdc9 25d xxxx xxxxxx xx
| |
| o 02407ec 25d xxxxx xxxxxx xxxxxx
| |
| o fe949e3 25d xxxx xxxxx xx xxxxxx xx xxxxxxx xxxx
| |
| o 00139fc 25d xxxx xxxxxxxxx xxxx xx xxxxxx
| |
| o 7848514 25d xxxxxx xxxxxx
| |
| o 8be9311 25d xxxx xxxxx xxxx xxxxxx xxxxx
| |
| o 014b13a 25d (redacted-ref-6) xxxxxxxx
|
O d12c188 25d xxxxx xxxx xxxxx
|\
: o e108478 25d xxxxx xxxxxx xxxxxxxxxxxxxx
: |
: o f7af8f9 25d xxxx xxxx
: |
: o 2e2b044 25d xxxx xxxx xxxx xxxxxxx
: |
: o b6e474c 25d xxxxxx xxxx xxxxxx xxxxxx xxxx xxxx xx xxxx xxxx xxxxx xx xx
: |
: o 48dc8b5 25d xxxx xxxxxx xxxxxx xxxxxxxx xx xxxx
: |
: o a3f5b28 25d xxxx xxxxxxxx xxxxxx xx
: |
: o ca2fe47 25d xxxx xxx xxxxxx xxxxx xxxxx
: |
: o 6cbec51 25d xxxx xxxxxx xxxxx
: |
: o b1cad43 25d xxxx xxxxxx xxxxx xxxxx
: |
: o 56b56d9 25d xxxxx xxxx xxxx xx xxxxxx
: |
: o 0b850a8 25d xxxxx xxx xx xx xxx xxx xx
: |
: o f08112a 25d xxxx xxxx xxxxxx xxxx xxx xxxx xxxxxxxxx
: |
: o 61f71fb 24d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxxxxxx xxxx
:
O 68491a7 23d (redacted-ref-8) xxxxxxxxx xxxx xxxxxxx
:
O 01bbc15 4d xxxx xxxxxx xxxxxxxx xxxxxxxx xx xxxxxxxxxxxx xxx xxx xxxxxxxx xx xx xxxxxxxxx
|\
: o 6e90a80 4d xxxxx xxxxxx xxxx xxx xxxxxxx xxxxxxxxx
: |
: o 9d482d6 4h xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx
: |
: o cb38414 26m xxxx xxxxxxx xxxxxxxxxxxxxx xxx xxx
: |\
: | o 2af5d7e 26m xxx xxxxxxx xxx xxxxxxx xxxxxxxxx xxxxxxx xxx xxxxxx xxxxxx xxxxxxx
: |
: o 9f1cde7 15m xxxx xxxxxxxxxx xxxxxxxxxxx xxxxx xx xxx xxxxxx xxxxxxxx
: |
: o 77a43fe 15m xxxx xxxxxxxx xx xxxxxx xxxxxxx xxxx xxxxxxxx xxxxxx xxxxxxxx
: |
: o 5140268 15m (redacted-ref-9) xxxxxxx xxx xxxxxx xxxxxxxx
:
@ d9b20d8 21m (main, redacted-ref-10) xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx

Event ID: 27, transaction ID: 20 (message: reference-transaction)

RefUpdateEvent { timestamp: 1701606256.4774027, event_tx_id: EventTransactionId(20), ref_name: ReferenceName("refs/heads/redacted-ref-10"), old_oid: 0000000000000000000000000000000000000000, new_oid: d9b20d80e7e4988260eaa166753778fb475df55f, message: None }

:
O da56717 258d xxxx xxxx xxxxx
|\
: o ec7bff6 254d (redacted-ref-0) xxxxxx xxxx
:
O 41f217a 75d (redacted-ref-1) xxxx xxx xxxx xx xxxxx
:
O b4de865 59d xxxxxx xxx xxxxx xxxxx
|\
: o 566ac90 59d (redacted-ref-2) xxxx xxxxxxxxx xxx xxxx
:
O c4a74e0 28d (redacted-ref-3) xxxx xxx xxxxxxxxx xxx xxxxxxx xxxx xxxx xxxxxxxxxx xxx xxxx xxx xxx xxxx
:
O 2ae7c32 28d (redacted-ref-4) xxxxx xxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xxxx xxxx xxxxxxx xxxx
:
O 53fbd66 26d (redacted-ref-5) xxxxxx xxxxx xxxxxx xxx xxxx xxxxxxxxxx
:
O c88160a 26d xxxxx xxxx xxxxxxx xxx xxxx xxxxxxxxxxxxxxxxxx
|\
| o 6c1960f 26d xxxxx xxxxx xxxx xxxxx xxxx
| |
| o 7624998 25d xxxxx xxx xxxxxxxxxxx
| |
| o 8dfbbc6 25d xxxx xxxx xxxxx xxxxxxx xxx xxxxx
| |
| o 90fbfaa 25d xxx xxxxx xxxx
| |
| o 4c2f136 25d xxxx xxxx xxx xxx xxxxx xxxx
| |
| o 898bdc9 25d xxxx xxxxxx xx
| |
| o 02407ec 25d xxxxx xxxxxx xxxxxx
| |
| o fe949e3 25d xxxx xxxxx xx xxxxxx xx xxxxxxx xxxx
| |
| o 00139fc 25d xxxx xxxxxxxxx xxxx xx xxxxxx
| |
| o 7848514 25d xxxxxx xxxxxx
| |
| o 8be9311 25d xxxx xxxxx xxxx xxxxxx xxxxx
| |
| o 014b13a 25d (redacted-ref-6) xxxxxxxx
|
O d12c188 25d xxxxx xxxx xxxxx
|\
: o e108478 25d xxxxx xxxxxx xxxxxxxxxxxxxx
: |
: o f7af8f9 25d xxxx xxxx
: |
: o 2e2b044 25d xxxx xxxx xxxx xxxxxxx
: |
: o b6e474c 25d xxxxxx xxxx xxxxxx xxxxxx xxxx xxxx xx xxxx xxxx xxxxx xx xx
: |
: o 48dc8b5 25d xxxx xxxxxx xxxxxx xxxxxxxx xx xxxx
: |
: o a3f5b28 25d xxxx xxxxxxxx xxxxxx xx
: |
: o ca2fe47 25d xxxx xxx xxxxxx xxxxx xxxxx
: |
: o 6cbec51 25d xxxx xxxxxx xxxxx
: |
: o b1cad43 25d xxxx xxxxxx xxxxx xxxxx
: |
: o 56b56d9 25d xxxxx xxxx xxxx xx xxxxxx
: |
: o 0b850a8 25d xxxxx xxx xx xx xxx xxx xx
: |
: o f08112a 25d xxxx xxxx xxxxxx xxxx xxx xxxx xxxxxxxxx
: |
: o 61f71fb 24d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxxxxxx xxxx
:
O 68491a7 23d (redacted-ref-8) xxxxxxxxx xxxx xxxxxxx
:
O 01bbc15 4d xxxx xxxxxx xxxxxxxx xxxxxxxx xx xxxxxxxxxxxx xxx xxx xxxxxxxx xx xx xxxxxxxxx
|\
: o 6e90a80 4d xxxxx xxxxxx xxxx xxx xxxxxxx xxxxxxxxx
: |
: o 9d482d6 4h xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx
: |
: o cb38414 26m xxxx xxxxxxx xxxxxxxxxxxxxx xxx xxx
: |\
: | o 2af5d7e 26m xxx xxxxxxx xxx xxxxxxx xxxxxxxxx xxxxxxx xxx xxxxxx xxxxxx xxxxxxx
: |
: o 9f1cde7 15m xxxx xxxxxxxxxx xxxxxxxxxxx xxxxx xx xxx xxxxxx xxxxxxxx
: |
: o 77a43fe 15m xxxx xxxxxxxx xx xxxxxx xxxxxxx xxxx xxxxxxxx xxxxxx xxxxxxxx
: |
: o 5140268 15m (redacted-ref-9) xxxxxxx xxx xxxxxx xxxxxxxx
:
@ d9b20d8 21m (main, redacted-ref-10) xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx

Event ID: 26, transaction ID: 19 (message: reference-transaction)

RefUpdateEvent { timestamp: 1701606242.7104185, event_tx_id: EventTransactionId(19), ref_name: ReferenceName("refs/remotes/redacted-ref-11"), old_oid: 0000000000000000000000000000000000000000, new_oid: d9b20d80e7e4988260eaa166753778fb475df55f, message: None }

:
O da56717 258d xxxx xxxx xxxxx
|\
: o ec7bff6 254d (redacted-ref-0) xxxxxx xxxx
:
O 41f217a 75d (redacted-ref-1) xxxx xxx xxxx xx xxxxx
:
O b4de865 59d xxxxxx xxx xxxxx xxxxx
|\
: o 566ac90 59d (redacted-ref-2) xxxx xxxxxxxxx xxx xxxx
:
O c4a74e0 28d (redacted-ref-3) xxxx xxx xxxxxxxxx xxx xxxxxxx xxxx xxxx xxxxxxxxxx xxx xxxx xxx xxx xxxx
:
O 2ae7c32 28d (redacted-ref-4) xxxxx xxxxx xxxxxxx xxxxxxx xxxxxxx xx xx xxxx xxxx xxxxxxx xxxx
:
O 53fbd66 26d (redacted-ref-5) xxxxxx xxxxx xxxxxx xxx xxxx xxxxxxxxxx
:
O c88160a 26d xxxxx xxxx xxxxxxx xxx xxxx xxxxxxxxxxxxxxxxxx
|\
| o 6c1960f 26d xxxxx xxxxx xxxx xxxxx xxxx
| |
| o 7624998 25d xxxxx xxx xxxxxxxxxxx
| |
| o 8dfbbc6 25d xxxx xxxx xxxxx xxxxxxx xxx xxxxx
| |
| o 90fbfaa 25d xxx xxxxx xxxx
| |
| o 4c2f136 25d xxxx xxxx xxx xxx xxxxx xxxx
| |
| o 898bdc9 25d xxxx xxxxxx xx
| |
| o 02407ec 25d xxxxx xxxxxx xxxxxx
| |
| o fe949e3 25d xxxx xxxxx xx xxxxxx xx xxxxxxx xxxx
| |
| o 00139fc 25d xxxx xxxxxxxxx xxxx xx xxxxxx
| |
| o 7848514 25d xxxxxx xxxxxx
| |
| o 8be9311 25d xxxx xxxxx xxxx xxxxxx xxxxx
| |
| o 014b13a 25d (redacted-ref-6) xxxxxxxx
|
O d12c188 25d xxxxx xxxx xxxxx
|\
: o e108478 25d xxxxx xxxxxx xxxxxxxxxxxxxx
: |
: o f7af8f9 25d xxxx xxxx
: |
: o 2e2b044 25d xxxx xxxx xxxx xxxxxxx
: |
: o b6e474c 25d xxxxxx xxxx xxxxxx xxxxxx xxxx xxxx xx xxxx xxxx xxxxx xx xx
: |
: o 48dc8b5 25d xxxx xxxxxx xxxxxx xxxxxxxx xx xxxx
: |
: o a3f5b28 25d xxxx xxxxxxxx xxxxxx xx
: |
: o ca2fe47 25d xxxx xxx xxxxxx xxxxx xxxxx
: |
: o 6cbec51 25d xxxx xxxxxx xxxxx
: |
: o b1cad43 25d xxxx xxxxxx xxxxx xxxxx
: |
: o 56b56d9 25d xxxxx xxxx xxxx xx xxxxxx
: |
: o 0b850a8 25d xxxxx xxx xx xx xxx xxx xx
: |
: o f08112a 25d xxxx xxxx xxxxxx xxxx xxx xxxx xxxxxxxxx
: |
: o 61f71fb 24d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxxxxxx xxxx
:
O 68491a7 23d (redacted-ref-8) xxxxxxxxx xxxx xxxxxxx
:
O 01bbc15 4d xxxx xxxxxx xxxxxxxx xxxxxxxx xx xxxxxxxxxxxx xxx xxx xxxxxxxx xx xx xxxxxxxxx
|\
: o 6e90a80 4d xxxxx xxxxxx xxxx xxx xxxxxxx xxxxxxxxx
: |
: o 9d482d6 4h xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx
: |
: o cb38414 26m xxxx xxxxxxx xxxxxxxxxxxxxx xxx xxx
: |\
: | o 2af5d7e 26m xxx xxxxxxx xxx xxxxxxx xxxxxxxxx xxxxxxx xxx xxxxxx xxxxxx xxxxxxx
: |
: o 9f1cde7 15m xxxx xxxxxxxxxx xxxxxxxxxxx xxxxx xx xxx xxxxxx xxxxxxxx
: |
: o 77a43fe 15m xxxx xxxxxxxx xx xxxxxx xxxxxxx xxxx xxxxxxxx xxxxxx xxxxxxxx
: |
: o 5140268 15m (redacted-ref-9) xxxxxxx xxx xxxxxx xxxxxxxx
:
@ d9b20d8 21m (main, redacted-ref-10) xxxxxx xxxxxxxxxxx xx xx xxxxxx xxxx

### Version of `git-branchless`

_No response_

### Version of `git`

_No response_

Waleed Khan · Answer 1 · Mon Dec 04 2023 02:54:02 GMT+0800 (China Standard Time)

/c/Users/Student/Documents/GitHub/backend/.git/hooks/post-rewrite: line 4: git: command not found

In this case, the rewrites are not being tracked because we fail to invoke git/git-branchless in the Git hook, and that's the way that git-branchless gets informed about commit rewrites.

It looks like this is the same as #370. Are you using Powershell/Cygwin/Git Bash? It seems that there was/is a bug in Git for Windows, so you might want to try development in WSL instead.

Tip ten Brink · Answer 2 · Mon Dec 04 2023 03:40:32 GMT+0800 (China Standard Time)

Yep, I'm using Powershell. I didn't see anything about there not being Windows support (I thought it was supported since it's also packaged on Windows package managers like Scoop, I didn't notice the CI is only WSL). I also did search for "Failed to process reference transaction!" in the issues but I missed the issue you mentioned as it was reported a while ago, my apologies.

You can definitely close this as a duplicate of that issue in that case. I do think it would be nice to make this issue a bit more visible (somewhere in the install instructions), to save people some time and troubleshooting.

Looking through that issue, this does seem very strange. Wish I had time to look into it, maybe in the future.

Thanks for the clarification though and again thanks for the tool, using it on my Linux machine it's definitely a blast!

Waleed Khan · Answer 3 · Wed Dec 27 2023 09:11:37 GMT+0800 (China Standard Time)

@tiptenbrink That's a good idea. I updated https://github.com/arxanas/git-branchless/wiki/Installation to caution against using Windows. Closing this in favor of #370 now.

`git move -x` leads to commit disappearing (branchless: Failed to process reference transaction!)

Description of the bug

Expected behavior

Actual behavior

Version of rustc

Automated bug report

Software version

Operating system

Command-line

Environment variables

Git version

Hooks

Hook post-applypatch

Hook post-checkout

Hook post-commit

Hook post-merge

Hook post-rewrite

Hook pre-auto-gc

Hook reference-transaction

Events

Event ID: 37, transaction ID: 24 (message: unhide)

Event ID: 30, transaction ID: 22 (message: undo)

Event ID: 28, transaction ID: 21 (message: move)

Event ID: 27, transaction ID: 20 (message: reference-transaction)

Event ID: 26, transaction ID: 19 (message: reference-transaction)

Version of `rustc`

Hook `post-applypatch`

Hook `post-checkout`

Hook `post-commit`

Hook `post-merge`

Hook `post-rewrite`

Hook `pre-auto-gc`

Hook `reference-transaction`