[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Obscure error/warning/information message from git pull
From: |
Teemu Likonen |
Subject: |
Re: Obscure error/warning/information message from git pull |
Date: |
Wed, 19 Nov 2014 06:48:02 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (gnu/linux) |
Alan Mackenzie [2014-11-18 22:43:26 +00:00] wrote:
>> Well, given the following history (time goes from left to right):
>
>> - C - D <- foo
>> /
>> ... - A - B
>> \
>> - E - F <- bar
>
>
>> what branch commit A was made on, 'foo' or 'bar'?
>
> Quite clearly, A was committed on branch foo, since bar didn't exist
> at that time.
No. "A" could have been committed on a private branch called
"asdfasdfasdf" by some unknown person. Then it may have been forget
various ways into that project's commit DAG. Branches are not places.
They just labels (sometimes temporary) that point to a commit. Nothing
more.
Commit operation in Git is like PUSH:
(defvar a (cons 'original nil))
(defvar foo a)
(defvar bar a)
(push 'commit1 foo)
(push 'commit2 foo)
(push 'commit1 bar)
(push 'commit2 bar)
Both "foo" and "bar" point to a single cons cell. They know nothing
about _variable_ "a" (i.e., branch label). The same applies for Git
branches.
signature.asc
Description: PGP signature
- Re: Obscure error/warning/information message from git pull, (continued)
- Re: Obscure error/warning/information message from git pull, Sergey Organov, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Alan Mackenzie, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Barry Warsaw, 2014/11/18
- Re: Obscure error/warning/information message from git pull, David Kastrup, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Yuri Khan, 2014/11/18
- Re: Obscure error/warning/information message from git pull, Eli Zaretskii, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Yuri Khan, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Sergey Organov, 2014/11/19
- Re: Obscure error/warning/information message from git pull,
Teemu Likonen <=
- Re: Obscure error/warning/information message from git pull, Stephen J. Turnbull, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Teemu Likonen, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Thien-Thi Nguyen, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Achim Gratz, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Alan Mackenzie, 2014/11/19
- Re: Obscure error/warning/information message from git pull, David Kastrup, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Sergey Organov, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Achim Gratz, 2014/11/19
- Re: Obscure error/warning/information message from git pull, David Kastrup, 2014/11/19
- Re: Obscure error/warning/information message from git pull, Sergey Organov, 2014/11/19