Hi, It's been a while since the last StGit release, mainly because it had all the features I needed (well, a few bug fixes since then that should have been released).
Anyway, I recently had to work in a team on a Linux kernel project and because our patches were interdependent, we decided that the best approach is to share the same branch on a common repository. But we also had to keep patches relatively clean for pushing upstream (http://git.kernel.org/?p=linux/kernel/git/cmarinas/linux-2.6-cm.git;a=shortlog;h=refs/heads/arm-lpae). To make merging between us easier, we went with using plain Git and instead of refreshing patches (the StGit way) we used new commits with the "fixup!" prefix. At some point one of us did a "git rebase -i --autosquash" to bring the fixups into patches (and some other clean-up, patch reordering). It all went well but I missed StGit in this workflow. What's missing in StGit is easy interworking with git commands like commit and rebase. This could be fixed by changing (reducing) the StGit metada to rely more on what Git already provides. The main visible effect would be patch names becoming automatic, similar to those generated by "stg uncommit" but without the possibility of renaming. The corresponding --name options and the "new" and "rename" commands would also disappear ("new" can be replaced by either "git commit" or an "stg commit" alias). The base of the stack is no longer maintained by StGit but determined as the common ancestor between the current branch and a parent/upstream branch (maybe defaulting to origin/master). All the commits from the common ancestor to HEAD are considered applied patches. The unapplied/popped patches (commits) could be linked into a separate refs/heads/<branch>.unapplied. The refs/<branch>/patches/<patch-name> are no longer created since refs/heads/* files can reach any of the applied or unapplied patches. The standard Git reflog can be used for undo information (though not infinite undo). Any thoughts? I don't want to start implementing this if people find the UI changes annoying. Thanks, Catalin _______________________________________________ stgit-users mailing list [email protected] https://mail.gna.org/listinfo/stgit-users
