From: Johannes Sixt <j6t@kdbg.org>
Date: Sat, 26 Jun 2010 18:09:30 GMT
Subject: Re: git-rebase --abort eats files
Message-ID: <201006262009.30380.j6t@kdbg.org>
In-Reply-To: <20100626125924.160F11F212@leonis4.robolove.meer.net>

On Samstag, 26. Juni 2010, Madhu wrote:
> Don't know if this has been resolved-by-debate here before, But adding
> a file via git-add in the middle of an interactive rebase and aborting
> the rebase deletes the hitherto untracked file.  It should not.
>
> Maybe something like this to fix it?
>
> +++ b/git-rebase--interactive.sh
> @@ -749,6 +749,7 @@ first and then run 'git rebase --continue' again."
>                         git symbolic-ref HEAD $HEADNAME
>                         ;;
>                 esac &&
> +               git-reset &&
>                 output git reset --hard $HEAD &&
>                 rm -rf "$DOTEST"
>                 exit

No, it can't be that simple. If rebase stopped due to a conflict on a commit 
that added new files, then your version of rebase --abort will leave these 
new files behind as untracked.

-- Hannes