On Tue, May 21, 2013 at 10:55:57PM -0400, Theodore Ts'o wrote: > To make it harder to accidentally do "git push" with a guilt patch > applied, "guilt push" changes branch from e.g. "master" to > "guilt/master" starting with commit 67d3af63f422. This is a feature > which I use for ext4 development; I actually *do* want to be able to > push patches to the dev branch, which is a rewindable branch much like > git's "pu" branch. > > Allow the use of the environment variable GUILT_FORCE_BARE_BRANCH > which disables the new behavior introduced by commit 67d3af63f422. Would it make sense to make it git-config-able instead? As an added bonus, one can then make the decision on per-repository basis. Jeff. > Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx> > Cc: Per Cederqvist <cederp@xxxxxxxxx> > --- > guilt | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/guilt b/guilt > index 309437a..9953bdf 100755 > --- a/guilt > +++ b/guilt > @@ -914,13 +914,22 @@ else > die "Unsupported operating system: $UNAME_S" > fi > > -if [ "$branch" = "$raw_git_branch" ] && [ -n "`get_top 2>/dev/null`" ] > -then > - # This is for compat with old repositories that still have a > - # pushed patch without the new-style branch prefix. > +if [ -n "`get_top 2>/dev/null`" ]; then > + # > + # If we have repositories patches pushed, then use whatever scheme > + # is currently in use > + # > + if [ "$branch" = "$raw_git_branch" ]; then > old_style_prefix=true > + else > + old_style_prefix=false > + fi > else > + if [ -n "$GUILT_FORCE_BARE_BRANCH" ]; then > + old_style_prefix=true > + else > old_style_prefix=false > + fi > fi > > _main "$@" > -- > 1.7.12.rc0.22.gcdd159b > -- Linux, n.: Generous programmers from around the world all join forces to help you shoot yourself in the foot for free. -- 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