| Re: [translations] Doc-it patch: chapter 5 of Usage |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Federico Bruni <fedelogy@xxxxxxxxx>
- Subject: Re: [translations] Doc-it patch: chapter 5 of Usage
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Sun, 24 Apr 2011 19:28:30 +0200
- Cc: translations <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=ywNJN7UUXarxTgEZhC+E+ciwcRWsCE6rJFbCOhukgug=; b=bj6AZiQsLywtHniV7zyRSWwxsLLVG7W3g++DoZKmBy/HcYYae6oOzZ0wUvtQCdzdvo 3fazrufYXihFJQUOjqgTH6jjiyMmdSrzGEtr1rouz0oeBztlZRP6A+ftQ16gRxNz6RuG 4un3Kpreh5rMwIKY7RjYDgpNWXRjCiD5sLEAg=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=cDhoituZ/BN/bIPOnE1v/UchBN96a8XJDvambEvA8LLvaxK7wNbRNapgCExYDiTaL4 FRWv39ncofvtZkGLWH0lupXnqxC06+vhw+mbE+EWm2mBDt6xs66vY6y+ZFLbYhTB9tnY U10+1mY9YgNxo/5EPkcKss4+tItiY5PlDZdCQ=
2011/4/24 Federico Bruni <fedelogy@xxxxxxxxx>:
> I have the same old question about Git. Sorry, I still can't understand
> what's happening.
>
> After I made the commit my branch was ahead of origin by 1 commit.
> It makes sense, it's ok.
> Then you pushed my patch, I pull and
What do you really expect to happen? You published a patch for other
to push it, the natural action now it's been pushed is to reset hard
to your previous commit. You don't need that commit anymore and your
work is upstream, so why to keep you own version of it?
> I'm now ahead by 2 commits (there
> is a merge commit).
> What happened?
Your patch had a whitespace error, in one or another step the
whitespace could have been supressed and therefore the commit now
online is not exactly the same you did. It comes to my mind as one
possibility.
> Why in my local copy my commit is duplicated (the same commit but
> different committish)? See:
>
> $ git log
> commit 08ac014434e6829cba0c184a31d96f1c9940b543
> Merge: 12d6de0 192439e
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date: Sun Apr 24 09:57:06 2011 +0200
>
> Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
> into lilypond/translation
>
> commit 192439e23bf243634b52f77dd7b084cac7a8d48c
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date: Sat Apr 23 16:55:09 2011 +0200
>
> Doc-it: add Suggestions chapter of Usage (plus some fixes)
>
> commit 12d6de0415aee9aa42c5e0fafaa94d064db63833
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date: Sat Apr 23 16:55:09 2011 +0200
>
> Doc-it: add Suggestions chapter of Usage (plus some fixes)
>
> commit a96f9fb96e5a3dd0cdb0e421b78c6c94200b234a
> Author: Francisco Vila <francisco.vila@xxxxxxxxxxxxx>
>
> I know that I can fix it by reverting to
> a96f9fb96e5a3dd0cdb0e421b78c6c94200b234a and pulling again.
> But I'd like to first understand what happened.
>
> git diff 12d6de0415aee9aa42c5e0fafaa94d064db63833
> 192439e23bf243634b52f77dd7b084cac7a8d48c
>
> doesn't show anything, so why these duplicates?
I'd expect the whitespace to be shown here, but if you don't have any
output from diff, then I don't really have any ideas.
Maybe the commit is different because you are the author of both and I
am the committer of one of them. The SHA ID of the commit is computed
from all and avery detail of the whole commit, not only its contents.
It's like a digital signature where you can not modify a single bit
and still expect the ID to be the same.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com