Simon Ruderich <si...@ruderich.org> writes: > --- > Hello, > > This patch fixes a minor issue with git-am. When the > applypatch-hook modifies the commit message, git-am displays the > original message. This patch updates the message to use the > modified version.
Please, read SubmittingPatches in the Documentation directory of Git's source tree. Your text above should be a commit message (hence, no hello), and should not be below the --- line. Also, read about signed-off-by in the same document. > diff --git a/git-am.sh b/git-am.sh > index 202130f..0997077 100755 > --- a/git-am.sh > +++ b/git-am.sh > @@ -795,6 +795,14 @@ To restore the original branch and stop patching run > \"\$cmdline --abort\"." > then > "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" || > stop_here $this > + > + # applypatch-msg can update the commit message. > + if test -f "$dotest/final-commit" > + then > + FIRSTLINE=$(sed 1q "$dotest/final-commit") > + else > + FIRSTLINE="" > + fi > fi This copy/paste a piece of code that is already a few lines above. Is there any reason not to _move_ the assignment to FIRSTLINE after the "if test -x "$GIT_DIR"/hooks/applypatch-msg", to avoid duplicating? Thanks, -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
