Skip to content

2.19.0-rc0: Rebase issues #1802

@rcdailey

Description

@rcdailey

So I thought I'd give 2.19 a shot, since in the release notes you suggested feedback if rebase doesn't work as I normally use it. So here's the gist of what I did:

$ git st
## release/2018.07.02...origin/release/2018.07.02
D  build.gradle
 A newfile

$ git rb -i origin/develop
error: Entry 'newfile' not uptodate. Cannot merge.
fatal: Cannot autostash

$ ll .git/
<snip>
-rw-r--r-- 1 Robert 197121    0 Aug 24 19:12 index.lock
<snip>

Relevant configuration:

[rebase]
    autoSquash = true
    autoStash = true
    instructionFormat = %an -- %s
[status]
    submodulesummary = false
    short = true
    branch = true
    relativePaths = false
[advice]
    detachedHead = false
    statusHints = false
    resolveConflict = false
[alias]
    rb = rebase --no-fork-point
    st = status

The issue is, obviously, that the .git/index.lock is still there after the failed rebase. Also the error after the rebase command doesn't make any sense to me. Hopefully you can diagnose this better than I can. Should this be brought to the git mailing list instead? I'm not sure if these are windows-specific issues. Let me know.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions