[PATCH v6 2/2] builtin/rebase.c: Remove pointless message

When doing 'git rebase --autostash ' with a dirty worktree a 'HEAD is now at ...' message is emitted, which is pointless as it refers to the old active branch which isn't actually moved. This commit removes the 'HEAD is now at...' message. Signed-off-b

[PATCH 2/2] builtin/rebase.c: Remove pointless message

When doing 'git rebase --autostash ' with a dirty worktree a 'HEAD is now at ...' message is emitted, which is pointless as it refers to the old active branch which isn't actually moved. This commit removes the 'HEAD is now at...' message. Signed-off-b

[PATCH v6 1/2] builtin/rebase.c: make sure the active branch isn't moved when autostashing

er git rebase upstream git stash apply $AUTOSTASH This commit reinstates the 'legacy script' behavior as introduced with 58794775: rebase: implement --[no-]autostash and rebase.autostash Signed-off-by: Ben Wijen --- builtin/rebase.c| 8 ++-- t/t3420-reb

[PATCH v6 0/2] rebase.c: make sure current branch isn't moved when autostashing

Here are my "fix things without making unnecessary changes" Fixing a copy-paste fault which I missed in v5... Ben Wijen (2): builtin/rebase.c: make sure the active branch isn't moved when autostashing builtin/rebase.c: Remove obsolete message builtin/rebase.c

[PATCH v5 2/2] builtin/rebase.c: Remove pointless message

When doing 'git rebase --autostash ' with a dirty worktree a 'HEAD is now at ...' message is emitted, which is pointless as it refers to the old active branch which isn't actually moved. This commit removes the 'HEAD is now at...' message. Signed-off-b

[PATCH v5 1/2] builtin/rebase.c: make sure the active branch isn't moved when autostashing

er git rebase upstream git stash apply $AUTOSTASH This commit reinstates the 'legacy script' behavior as introduced with 58794775: rebase: implement --[no-]autostash and rebase.autostash Signed-off-by: Ben Wijen --- builtin/rebase.c| 8 ++-- t/t3420-reb

[PATCH v5 0/2] rebase.c: make sure current branch isn't moved when autostashing

Here are my "fix things without making unnecessary changes" Ben Wijen (2): builtin/rebase.c: make sure the active branch isn't moved when autostashing builtin/rebase.c: Remove obsolete message builtin/rebase.c| 13 + t/t3420-rebase-au

[PATCH v4 1/1] rebase.c: make sure the active branch isn't moved when autostashing

ash is re-applied after the rebase, leaving nothing to be guessed about. Thank you, Ben Wijen (1): rebase.c: make sure the active branch isn't moved when autostashing builtin/rebase.c| 18 ++ t/t3420-rebase-autostash.sh | 12 2 files changed, 14 insertions(+), 16 deletions(-) -- 2.22.0

[PATCH v4 1/1] rebase.c: make sure the active branch isn't moved when autostashing

...' message has now been removed. Signed-off-by: Ben Wijen --- builtin/rebase.c| 18 ++ t/t3420-rebase-autostash.sh | 12 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 670096c065..a928f44941

[PATCH v3 1/1] rebase.c: make sure the active branch isn't moved when autostashing

...' message has now been removed. Signed-off-by: Ben Wijen --- builtin/rebase.c| 18 ++ t/t3420-rebase-autostash.sh | 16 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 670096c065..a

[PATCH v3 0/1] rebase.c: make sure the active branch isn't moved when autostashing

Hi, I have done some more tests on what's actually going on. The active branch is currently reset to master (before the rebase) The confusion was because of me naming the active branch 'upstream' I hope this clears things up... Ben Wijen (1): rebase.c: make sure the active bra

[PATCH v2 1/1] rebase.c: make sure current branch isn't moved when autostashing

tash apply $AUTOSTASH This commit reinstates the 'legacy script' behavior as introduced with 58794775: rebase: implement --[no-]autostash and rebase.autostash Signed-off-by: Ben Wijen --- builtin/rebase.c| 18 ++ t/t3420-rebase-autostash.sh | 13 +-

[PATCH v2 0/1] git rebase: Make sure upstream branch is left alone.

Hi Phillip, Junio, Thank you for taking the time to look into this. With this new patch I think I've addressed all your concerns. Ben Wijen (1): rebase.c: make sure current branch isn't moved when autostashing builtin/rebase.c| 18 ++ t/t3420-rebase-au

[PATCH 1/2] t3420: never change upstream branch

When using `git rebase --autostash ` and the workarea is dirty, the active branch is incorrectly reset to the rebase branch. This test will check for such behavior. Signed-off-by: Ben Wijen --- t/t3420-rebase-autostash.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/t3420

[PATCH 2/2] rebase.c: make sure current branch isn't moved when autostashing

The rebase --autostash incorrectly moved the current branch to orig_head, where orig_head -- commit object name of tip of the branch before rebasing It seems this was incorrectly taken over from git-legacy-rebase.sh Signed-off-by: Ben Wijen --- builtin/rebase.c| 18

[PATCH 0/2] git rebase: Make sure upstream branch is left alone.

I found an issue with git rebase --autostash with an dirty worktree/index. It seems the currently active branch is moved, which is not correct. The following patches contain both a test and a fix. Ben Wijen (2): t3420: never change upstream branch rebase.c: make sure current branch isn&#