LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* git/cogito/stgit interaction problem
@ 2007-01-27 15:59 Adrian Bunk
0 siblings, 0 replies; only message in thread
From: Adrian Bunk @ 2007-01-27 15:59 UTC (permalink / raw)
I often run into the following annoying problem when working on the
2.6.16 and trivial trees:
I want to change or delete the x-th commit from the top under the
- the last x commits don't contain merges
- the last x commits aren't pushed anywhere else
The only tool I know that helps me doing this conveniently is stgit.
$ cg-push # everything is pushed in this testcase
$ vi Makefile
Committed as 94b13e5b0f46ba38ee6fd8f47b418d8a18eded52
$ stg init
$ stg uncommit -n 1 # uncommit x-1 commits
Uncommitting 1 patches... done
$ stg pop -a
Popping patch "asdf"... done
No patches applied
$ # in real use cases, that's the point where I'm using
$ # cg-admin-uncommit (plus perhaps later cg-commit) on the x-th commit
$ stg push -a
Fast-forwarded patch "asdf"
Now at patch "asdf"
$ stg commit
Committing 1 patches... done
$ cg-admin-uncommit -t
Rewinding 94b13e5b0f46ba38ee6fd8f47b418d8a18eded52 (HEAD) -> 08ceda6f8c5d68108308cf01fc5c3ec35775baa9
$ cg-push # should work (and report that the tree is unchanged in this testcase)
error: src refspec master matches more than one.
fatal: unexpected EOF
$ cat .git/refs/bases/master
$ rm -r .git/refs/bases # workaround found using Google
$ cg-push # works fine
Any hints on whom to blame for this?
Or if these tools aren't expected to work together in this way, what is
the official way for getting the same functionality?
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-01-27 15:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-01-27 15:59 git/cogito/stgit interaction problem Adrian Bunk
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 NNTP newsgroup(s).