From: Junio C Hamano Date: Wed, 25 Dec 2019 19:13:41 GMT Subject: Re: [PATCH v5 0/4] git-p4: Usability enhancements Message-ID: In-Reply-To: Luke Diamand writes: > $ git log --reverse --oneline --abbrev-commit > origin/maint..origin/bk/p4-misc-usability > e2aed5fd5b git-p4: yes/no prompts should sanitize user text > - looks good to me > > 608e380502 git-p4: show detailed help when parsing options fail > - also looks good to me > > c4dc935311 git-p4: wrap patchRCSKeywords test to revert changes on failure > - why not just catch the exception, and then drop out of the "if-" > condition and fall into the cleanup section at the bottom of that > function (line 1976)? As it stands, this is duplicating the cleanup > code now. > > 89c88c0ecf (origin/bk/p4-misc-usability) git-p4: failure because of > RCS keywords should show help > - strictly speaking, the code does not actually check if there *are* > any RCS keywords, it just checks if the filetype means that RCS kws > *would* be expanded *if* they were present. The conflict might be just > because....there's a conflict. As it stands this will be giving > misleading advice. I would get it to check to see if there really are > any RCS keywords in the file. Thanks. Ben, let's keep the first two and discard the rest for now, which can later be replaced with updated ones.