"git-pull --no-commit" should imply --no-ff...?

"git-pull --no-commit" should imply --no-ff...?

[Stefan Richter]

Hi list,

trying "git pull --no-commit . foo" for the first time, I was confused
that --no-commit was a no-op when the pull resulted in a fast-forward.
I.e. HEAD advanced the whole chain of commits to foo.  I expected it to
apply the diff of HEAD..foo but not commit them.

I then learned that "git pull --no-ff --no-commit . foo" does what I
wanted.  What good does it do to ignore --no-commit in the fast-forward
case unless --no-ff is given?

This is with git 1.5.4.5.
-- 
Stefan Richter
-=====-==--- -==- =-=-=
http://arcgraph.de/sr/

Re: "git-pull --no-commit" should imply --no-ff...?

[Graham Wilson]

On Sat, Jun 21, 2008 at 04:08:51PM +0200, Stefan Richter wrote:
> trying "git pull --no-commit . foo" for the first time, I was confused
> that --no-commit was a no-op when the pull resulted in a fast-forward.
> I.e. HEAD advanced the whole chain of commits to foo.  I expected it to
> apply the diff of HEAD..foo but not commit them.

--no-commit to me seems to mean don't commit a merge commit. Maybe what
you want is something like:

 git-diff HEAD foo | git-apply

-- 
gram

Re: "git-pull --no-commit" should imply --no-ff...?

[Miklos Vajna]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

On Sun, Jun 22, 2008 at 08:36:06AM -0500, Graham Wilson <graham@mknod.org> wrote:
> On Sat, Jun 21, 2008 at 04:08:51PM +0200, Stefan Richter wrote:
> > trying "git pull --no-commit . foo" for the first time, I was confused
> > that --no-commit was a no-op when the pull resulted in a fast-forward.
> > I.e. HEAD advanced the whole chain of commits to foo.  I expected it to
> > apply the diff of HEAD..foo but not commit them.
> 
> --no-commit to me seems to mean don't commit a merge commit. Maybe what
> you want is something like:
> 
>  git-diff HEAD foo | git-apply

Or git merge --no-commit --squash?

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: "git-pull --no-commit" should imply --no-ff...?

[Stefan Richter]

Graham Wilson wrote:
> On Sat, Jun 21, 2008 at 04:08:51PM +0200, Stefan Richter wrote:
>> trying "git pull --no-commit . foo" for the first time, I was confused
>> that --no-commit was a no-op when the pull resulted in a fast-forward.
>> I.e. HEAD advanced the whole chain of commits to foo.  I expected it to
>> apply the diff of HEAD..foo but not commit them.
> 
> --no-commit to me seems to mean don't commit a merge commit. Maybe what
> you want is something like:
> 
>  git-diff HEAD foo | git-apply
> 

Yes, I obviously got the wrong idea about git-pull --no-commit.
git-diff + git-apply indeed accomplishes what I wanted to do.  Thanks,
-- 
Stefan Richter
-=====-==--- -==- =-==-
http://arcgraph.de/sr/