Joshua Williams <joshua.williams@xxxxxxxxxx> wrote: > Small change. Still need to load MERGE_MSG and SQUASH_MSG > if there's no prepare-commit-msg hook. We now process the hook > first and if it's not there, load MERGE_MSG or SQUASH_MSG. > > Signed-off-by: Joshua Williams <joshua.williams@xxxxxxxxxx> This patch looks reasonable. My only comment is maybe we want to delete PREPARE_COMMIT_MSG file when we "exit 1" when the hook has declined. > diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh > index 10d8a44..8d06cd1 100755 > --- a/git-gui/git-gui.sh > +++ b/git-gui/git-gui.sh Can you please try to put this onto my current git-gui tree? I don't have the base 10d8a44 object so I can't 3-way merge this in, and the patch doesn't apply cleanly anymore. -- Shawn. -- 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
