git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Blaise Garant <blaise@garantcoutu.com>
To: git@vger.kernel.org
Subject: rebase --abort Unespected behavior
Date: Fri, 28 Feb 2020 12:36:14 -0500	[thread overview]
Message-ID: <CANXsDork=bL=SUodXDzkcnjpPALm53e++UkVkJFWxaZPMBK-SQ@mail.gmail.com> (raw)

Hello,

I don't know if this is a bug but it was unexpected for us. I
accidentally added untracked files through a `git add .` while doing
an interactive rebase and aborting the rebase deleted those files. Is
this to be expected?

To reproduce:
mkdir test_folder
cd test_folder
git init
touch first
git add .
git commit -m 'First'
echo 1 >> first
git add .
git commit -m 'Second'
echo 2 >> first
git add .
touch second
git commit -m 'Third'
git rebase -i HEAD~2 #set second to be edited
git add .
git status        #second should have staged
git rebase --abort
ls        #second has been deleted

Not sure this is an expected behavior.
Thanks
Blaise Garant

             reply	other threads:[~2020-02-28 17:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-28 17:36 Blaise Garant [this message]
2020-02-29 14:28 ` rebase --abort Unespected behavior Phillip Wood
2020-02-29 15:51   ` Elijah Newren
2020-03-04 20:55     ` Phillip Wood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CANXsDork=bL=SUodXDzkcnjpPALm53e++UkVkJFWxaZPMBK-SQ@mail.gmail.com' \
    --to=blaise@garantcoutu.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).