Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes: > Ahh, looks like a git-am buglet then. It will indeed turn an empty subject > line into an empty first line. > > We should run "git stripspace" on the whole thing, so maybe a patch > something like the appended will help. > > NOTE! Totally untested! Beware the patch! The basic idea is very sound and as usual your patch deletes more lines than it adds, which always impresses me. I wish all our patches are like this. > @@ -388,6 +383,7 @@ do > ;; > esac > esac > + FIRSTLINE=$(head -1 "$dotest/final-commit") > > resume= > if test "$interactive" = t > @@ -408,7 +404,6 @@ do > [aA]*) action=yes interactive= ;; > [nN]*) action=skip ;; > [eE]*) git_editor "$dotest/final-commit" > - SUBJECT=$(reread_subject "$dotest/final-commit") This needs to be replaced with re-assignment to FIRSTLINE, as the user may have fixed the title in the editor; otherwise... > @@ -431,7 +426,7 @@ do > stop_here $this > fi > > - printf 'Applying %s\n' "$SUBJECT" > + printf 'Applying %s\n' "$FIRSTLINE" ... this would surprise the user who expects us to give the report with the updated title. -- 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
