Posted my work-in-progress trees

Gerald (Jerry) Carter jerry at samba.org
Sat Oct 13 22:44:12 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jeremy Allison wrote:
> On Sat, Oct 13, 2007 at 11:38:24PM +0200, Volker Lendecke wrote:
>> On Thu, Oct 11, 2007 at 11:19:25AM -0500, Gerald (Jerry) Carter wrote:
>>> I've posted by active development git repo to
>>>
>>> 	git://git.samba.org/jerry/samba.git
>> Mine is at
>>
>> git://git.samba.org/vl/samba.git
>>
>> The checkin I'd like to have some feedback on is turning
>> GET_NT_ACL to return NTSTATUS instead of size_t.
> 
> Ok, I know I'm being dumb, but how do I get access
> to the diff for that ?

Several ways:

Method #1 (pulling changes to a local branch):

  $ git-checkout -b local-3-2-test origin/v3-2-test
  $ git-pull git://git.samba.org/vl/samba.git v3-2-test

The just view the changes via "git-log -p:

Method #2 (add a remote reference)

  $ cd $HOME/src/git/samba
  $ git-remote add vl git://git.samba.org/vl/samba.git
  $ git-fetch vl
  $ git-fetch origin
  $ git-log -p origin/v3-2-test..vl/v3-2-test

Once you have a remote reference (stored in .git/refs/remotes/vl/),
you merge them to a local v3-2-test tree by

  $ git-checkout -b local-3-2-test origin/v3-2-test
  $ git-merge vl/v3-2-test

Remember that "git-pull" == "git-fetch && git-merge" which is why
both yield the same results.




cheers, jerry
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHEUo8IR7qMdg1EfYRAqFBAJ4zcQFawXJs/m1ZVn123pt/Q6RY0gCgmdnU
GY1x2Qe1wPUAZCwpt/r8yIY=
=L1Yh
-----END PGP SIGNATURE-----


More information about the samba-technical mailing list