Hi,
I'm trying to rebase a branch ("msmtp") on another branch ("devel").
The msmtp has a number of commits that are already in the devel branch
(but with different history) and one new commit that adds one file.
$ git clone git://repo.or.cz/msysgit.git
$ cd msysgit
$ git rev-parse origin/msmtp
b11cf4ce6262a7c3b243e3cfdc70e6b44682cb59
$ git rev-parse origin/devel
57aa8405103856106ec0e31453089c33c899c98b
$ git -b checkout devel origin/devel
$ git -b checkout msmtp origin/msmtp
$ git show-branch msmtp devel
* [msmtp] Added msmtp.exe SMTP client
! [devel] Add disk summarize tool (du.exe)
--
+ [devel] Add disk summarize tool (du.exe)
+ [devel^] gdb updated to v6.6
+ [devel~2] w32api updated to v3.10
+ [devel~3] Updated gcc to v3.4.5
+ [devel~4] Updated binutils to v2.17.50
+ [devel~5] Remove remnants of the c++ compiler
+ [devel~6] GitMe: only fetch 'master' of msysgit.git
+ [devel~7] GitMe: inline 7z's install script
+ [devel~8] GitMe: avoid dependency on cmd.exe
+ [devel~9] msysGit: adjust for submodule layout
+ [devel~10] msysGit: we have 7zip installed in /share/7-Zip/ now
+ [devel~11] msysGit: 7z cannot update existing installers
+ [devel~12] msysGit: move scripts to /share/msysGit/
+ [devel~13] WinGit: do not pack builtins, but copy them when unpacking
+ [devel~14] Update TODO: Marius squashed two
+ [devel~15] WinGit: strip executables (Issue 25)
+ [devel~16^2] GitMe: fix HTTP transport
+ [devel~16^2^] Undo hacky she-bang fixup
+ [devel~16^2~2] Issue 21: core.autocrlf should be set to true (at
least for end-users)
+ [devel~16^2~3] Add clear script, and remove the clear=clsb alias in profile
+ [devel~16^2~4] Make 7z functional
+ [devel~16^2~5] msys: support for Windows XP x64
+ [devel~16^2~6] Removed all SuperGitMe functionality Also propagated
latest fixes and made installer even smaller
+ [devel~16^2~7] Fixed Issue 37: Errors during install because repo
now has tags
+ [devel~18] Issue 21: core.autocrlf should be set to true (at least
for end-users)
+ [devel~19] Add clear script, and remove the clear=clsb alias in profile
+ [devel~20] Make 7z functional
+ [devel~21] msys: support for Windows XP x64
+ [devel~22] GitMe SuperFetch
+ [devel~23] Latest git submodule
* [msmtp] Added msmtp.exe SMTP client
* [msmtp^] gdb updated to v6.6
* [msmtp~2] w32api updated to v3.10
* [msmtp~3] Updated gcc to v3.4.5
* [msmtp~4] Updated binutils to v2.17.50
* [msmtp~5] Remove remnants of the c++ compiler
*+ [devel~24] GitMe: check if cygwin is in PATH; if so abort installer.
$ find bin -name "msmtp.exe"
bin/msmtp.exe
Note! that this file is added with the commit "* [msmtp] Added
msmtp.exe SMTP client". After rebase I expect that this commit will be
on top of the devel branch.
$ cat .git/HEAD
ref: refs/heads/msmtp
$ git rebase devel
First, rewinding head to replay your work on top of it...
HEAD is now at 57aa840... Add disk summarize tool (du.exe)
Nothing to do.
$ git show-branch msmtp devel
* [msmtp] Add disk summarize tool (du.exe)
! [devel] Add disk summarize tool (du.exe)
--
*+ [msmtp] Add disk summarize tool (du.exe)
$ find bin -name "msmtp.exe"
And the msmtp commit + file is lost.
I've tested on windows (4msysgit.git):
$ git --version
git version 1.5.3.rc4.mingw.2.49.g3314
And on linux (git.git):
$ git --version
git version 1.5.2.5.g0734d
And on linux with next branch (git.git)
$ git version
git version 1.5.3.rc5.843.gdac75
Is this a bug? Any ideas?
Best regards,
//Torgil
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
