New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unable to git rebase since 170316 [64] {Preview} #1085

Closed
Zooce opened this Issue Mar 27, 2017 · 12 comments

Comments

Projects
None yet
2 participants
@Zooce

Zooce commented Mar 27, 2017

Versions

ConEmu build: 170326 preview x64
OS version: Windows 7 x64
Used shell version: git-bash
Git version: 1.9.5.msysgit.0

Problem description

When trying to do a git rebase master I get the following error:

fatal: Needed a single revision
invalid upstream master

I know this is an issue within ConEmu because I tried the same thing directly in GitBash, and the rebase works fine.

Steps to reproduce

  1. Clone a git repo
  2. Branch off of master
  3. Make commits on new branch
  4. Make commits on master
  5. Rebase new branch onto master

Actual results

Rebase fails.

Expected results

Rebase doesn't fail.

@Maximus5

This comment has been minimized.

Show comment
Hide comment
@Maximus5

Maximus5 Mar 28, 2017

Owner

I do not believe the same command with exactly the same conditions does not fail without ConEmu.

Third-party application problems

Owner

Maximus5 commented Mar 28, 2017

I do not believe the same command with exactly the same conditions does not fail without ConEmu.

Third-party application problems

@Maximus5

This comment has been minimized.

Show comment
Hide comment
@Maximus5

Maximus5 Mar 28, 2017

Owner

ConEmu can't physically do anything to "change" git upstream.

Owner

Maximus5 commented Mar 28, 2017

ConEmu can't physically do anything to "change" git upstream.

@Maximus5 Maximus5 added the other-git label Mar 28, 2017

@Zooce

This comment has been minimized.

Show comment
Hide comment
@Zooce

Zooce Mar 28, 2017

The following is a screenshot of using the same command in the two environments in the same repo (ConEmu on the left, GitBash on the right):

conemu64_2017-03-27_17-32-00

Here are the settings for both:

conemu64_2017-03-27_17-35-41

Zooce commented Mar 28, 2017

The following is a screenshot of using the same command in the two environments in the same repo (ConEmu on the left, GitBash on the right):

conemu64_2017-03-27_17-32-00

Here are the settings for both:

conemu64_2017-03-27_17-35-41

@Maximus5

This comment has been minimized.

Show comment
Hide comment
@Maximus5

Maximus5 Mar 28, 2017

Owner

She git status and git --version in both environments.

Owner

Maximus5 commented Mar 28, 2017

She git status and git --version in both environments.

@Zooce

This comment has been minimized.

Show comment
Hide comment
@Zooce

Zooce Mar 28, 2017

conemu64_2017-03-27_21-04-28

Others on my team have older versions of ConEmu, and they're not seeing any issues. My repo has a clean history, and I even have a fresh clone where this same issue happens. I do not believe this is a git issue.

Zooce commented Mar 28, 2017

conemu64_2017-03-27_21-04-28

Others on my team have older versions of ConEmu, and they're not seeing any issues. My repo has a clean history, and I even have a fresh clone where this same issue happens. I do not believe this is a git issue.

@Maximus5

This comment has been minimized.

Show comment
Hide comment
@Maximus5

Maximus5 Mar 28, 2017

Owner

It would be helpful to know what version is working and where the problem appears.

Owner

Maximus5 commented Mar 28, 2017

It would be helpful to know what version is working and where the problem appears.

@Zooce

This comment has been minimized.

Show comment
Hide comment
@Zooce

Zooce Mar 28, 2017

Working version info:

ConEmu: 170316 [64] {Preview}
Git: 2.11.0.windows.1

ConEmu: 170326 [64] {Preview}
Git: 2.11.0.windows.1

ConEmu: 170316 [64] {Preview}
Git: 1.9.5.msysgit.0

ConEmu: 150813g [64]
Git: 1.9.5.msysgit.0

Issue found with:

ConEmu: 170326 [64] {Preview}
Git: 1.9.5.msysgit.0

Zooce commented Mar 28, 2017

Working version info:

ConEmu: 170316 [64] {Preview}
Git: 2.11.0.windows.1

ConEmu: 170326 [64] {Preview}
Git: 2.11.0.windows.1

ConEmu: 170316 [64] {Preview}
Git: 1.9.5.msysgit.0

ConEmu: 150813g [64]
Git: 1.9.5.msysgit.0

Issue found with:

ConEmu: 170326 [64] {Preview}
Git: 1.9.5.msysgit.0

@Maximus5

This comment has been minimized.

Show comment
Hide comment
@Maximus5

Maximus5 Mar 28, 2017

Owner

That is not useful. Two years passed since 150813g.

Owner

Maximus5 commented Mar 28, 2017

That is not useful. Two years passed since 150813g.

@Zooce

This comment has been minimized.

Show comment
Hide comment
@Zooce

Zooce Mar 28, 2017

I've updated my last comment to add my previous version, where git was working.

Maybe this is more relevant?

170316 [64] {Preview} with git version 1.9.5.msysgit.0 ..........Working
170316 [64] {Preview} with git version 2.11.0.windows.1 ..........Working

170326 [64] {Preview} with git version 1.9.5.msysgit.0 ..........Not working
170326 [64] {Preview} with git version 2.11.0.windows.1 ..........Working

Zooce commented Mar 28, 2017

I've updated my last comment to add my previous version, where git was working.

Maybe this is more relevant?

170316 [64] {Preview} with git version 1.9.5.msysgit.0 ..........Working
170316 [64] {Preview} with git version 2.11.0.windows.1 ..........Working

170326 [64] {Preview} with git version 1.9.5.msysgit.0 ..........Not working
170326 [64] {Preview} with git version 2.11.0.windows.1 ..........Working

@Maximus5

This comment has been minimized.

Show comment
Hide comment
@Maximus5

Maximus5 Mar 28, 2017

Owner

Git 2.11 is absolutely different bundle and its not related to the issue.
Are you sure there is no problem with 170316/1.9.5?

Owner

Maximus5 commented Mar 28, 2017

Git 2.11 is absolutely different bundle and its not related to the issue.
Are you sure there is no problem with 170316/1.9.5?

@Zooce

This comment has been minimized.

Show comment
Hide comment
@Zooce

Zooce Mar 28, 2017

My apologies, it's 170305/1.9.5 that was working.

conemu64_2017-03-28_16-16-57

Zooce commented Mar 28, 2017

My apologies, it's 170305/1.9.5 that was working.

conemu64_2017-03-28_16-16-57

@Zooce Zooce changed the title from Unable to git rebase in 170326 preview to Unable to git rebase since 170316 [64] {Preview} Mar 30, 2017

@Maximus5 Maximus5 added hooks and removed other-git labels Apr 2, 2017

@Zooce

This comment has been minimized.

Show comment
Hide comment
@Zooce

Zooce Apr 7, 2017

Just as a quick update, this seems to be fixed in 170402 [64] {Preview} using Git 1.9.5.

Zooce commented Apr 7, 2017

Just as a quick update, this seems to be fixed in 170402 [64] {Preview} using Git 1.9.5.

@Maximus5 Maximus5 closed this Apr 7, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment