From: Felipe Contreras Date: Sun, 25 Oct 2009 09:02:27 GMT Subject: Re: [PATCH] Use 'fast-forward' all over the place Message-ID: <94a0d4530910250202h7a890575md080a554f9e0b3e6@mail.gmail.com> In-Reply-To: <7v1vks2l8q.fsf@alter.siamese.dyndns.org> On Sun, Oct 25, 2009 at 6:41 AM, Junio C Hamano wrote: > This is the latter half of my review; please see > >    From:       Junio C Hamano >    Subject: Re: [PATCH] Use 'fast-forward' all over the place >    Date:       Sat, 24 Oct 2009 10:50:05 -0700 >    Message-ID: <7v3a587kc2.fsf@alter.siamese.dyndns.org> > > for the other half. > > Felipe Contreras writes: >> diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email >> @@ -315,8 +315,8 @@ generate_update_branch_email() >>       # "remotes/" will be ignored as well. >> >>       # List all of the revisions that were removed by this update, in a >> -     # fast forward update, this list will be empty, because rev-list O >> -     # ^N is empty.  For a non fast forward, O ^N is the list of removed >> +     # fast-forward update, this list will be empty, because rev-list O >> +     # ^N is empty.  For a non fast-forward, O ^N is the list of removed > > Wasn't non-fast-forward a single compound word of three? Yes, but as I mentioned before; it's not something I'm tackling on this patch: only "non-fast forward". I think a separate patch should be done for "non fast.forward" -> non-fast-forward. >> diff --git a/git-gui/lib/branch_create.tcl b/git-gui/lib/branch_create.tcl >> index 3817771..f1235c7 100644 >> --- a/git-gui/lib/branch_create.tcl >> +++ b/git-gui/lib/branch_create.tcl >> @@ -77,7 +77,7 @@ constructor dialog {} { >>               -variable @opt_merge >>       pack $w.options.merge.no -side left >>       radiobutton $w.options.merge.ff \ >> -             -text [mc "Fast Forward Only"] \ >> +             -text [mc "Fast-forward Only"] \ >>               -value ff \ >>               -variable @opt_merge >>       pack $w.options.merge.ff -side left > > Please leave git-gui out; (1) it is not managed by me and the patch should > be fed to Shawn separately, and (2) updating [mc] keystrings must need > matching updates to the translation file and the templates. > > I also think this is a label string and the capitalization must be kept, > i.e. "Fast-Forward Only". Ok. >> diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh >> @@ -51,7 +51,7 @@ check_cache_at () { >>  } >> >>  cat >bozbar-old <<\EOF >> -This is a sample file used in two-way fast forward merge >> +This is a sample file used in two-way fast-forward merge >>  tests.  Its second line ends with a magic word bozbar >>  which will be modified by the merged head to gnusto. >>  It has some extra lines so that external tools can > > Doesn't changing this change the actual test blob used?  Do you know if > the test still passes when git is not broken? I didn't check. I will. Cheers. -- Felipe Contreras