* StGIT loses Git commit using "stg repair"; I miss "stg assimilate"
@ 2008-01-07 22:45 Jakub Narebski
2008-01-07 23:11 ` David Kågedal
0 siblings, 1 reply; 3+ messages in thread
From: Jakub Narebski @ 2008-01-07 22:45 UTC (permalink / raw)
To: git; +Cc: Catalin Marinas
I have StGIT branch with no patches applied: all patches are on stack.
I have accidentally added git commit on top of StGIT branch head.
I tried to use "stg assimilate" to turn this commit into StGIT commit,
applied, but new version of StGIT has only "stg repair". And the
sequence
# stg repair
# stg rebase origin
made me lose this git commit (well, up to reflog of course). This should
not happen! Why assimilate got removed?
4206:[gitweb/web@git]# stg --version
Stacked GIT 0.14.1
git version 1.5.3.7
Python version 2.4.3 (#1, Jun 13 2006, 16:41:18)
[GCC 4.0.2 20051125 (Red Hat 4.0.2-8)]
--
Jakub Narebski
Poland
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: StGIT loses Git commit using "stg repair"; I miss "stg assimilate"
2008-01-07 22:45 StGIT loses Git commit using "stg repair"; I miss "stg assimilate" Jakub Narebski
@ 2008-01-07 23:11 ` David Kågedal
2008-01-07 23:15 ` David Kågedal
0 siblings, 1 reply; 3+ messages in thread
From: David Kågedal @ 2008-01-07 23:11 UTC (permalink / raw)
To: git
Jakub Narebski <jnareb@gmail.com> writes:
> I have StGIT branch with no patches applied: all patches are on stack.
> I have accidentally added git commit on top of StGIT branch head.
> I tried to use "stg assimilate" to turn this commit into StGIT commit,
> applied, but new version of StGIT has only "stg repair". And the
> sequence
If you have no patches, there is nothing to assimilate or repair. Your
patch stack is considered to be on top of your new commit, so if you
push a patch it will appear on top of the commit you just created.
To turn your new commit into a patch, use "stg uncommit".
> # stg repair
> # stg rebase origin
>
> made me lose this git commit (well, up to reflog of course). This should
> not happen! Why assimilate got removed?
repair does exactly what assimilate did in this case, so it would not
have helped you.
--
David Kågedal
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: StGIT loses Git commit using "stg repair"; I miss "stg assimilate"
2008-01-07 23:11 ` David Kågedal
@ 2008-01-07 23:15 ` David Kågedal
0 siblings, 0 replies; 3+ messages in thread
From: David Kågedal @ 2008-01-07 23:15 UTC (permalink / raw)
To: git
David Kågedal <davidk@lysator.liu.se> writes:
> Jakub Narebski <jnareb@gmail.com> writes:
>
>> I have StGIT branch with no patches applied: all patches are on stack.
>> I have accidentally added git commit on top of StGIT branch head.
>> I tried to use "stg assimilate" to turn this commit into StGIT commit,
>> applied, but new version of StGIT has only "stg repair". And the
>> sequence
>
> If you have no patches, there is nothing to assimilate or repair. Your
That should have been "if you have no patches *applied* ..."
> patch stack is considered to be on top of your new commit, so if you
> push a patch it will appear on top of the commit you just created.
>
> To turn your new commit into a patch, use "stg uncommit".
>
>> # stg repair
>> # stg rebase origin
>>
>> made me lose this git commit (well, up to reflog of course). This should
>> not happen! Why assimilate got removed?
>
> repair does exactly what assimilate did in this case, so it would not
> have helped you.
--
David Kågedal
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-01-07 23:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-07 22:45 StGIT loses Git commit using "stg repair"; I miss "stg assimilate" Jakub Narebski
2008-01-07 23:11 ` David Kågedal
2008-01-07 23:15 ` David Kågedal
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.