Re: [RFC] origin link for cherry-pick and revert

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Linus Torvalds <torvalds@...>
Cc: Jakub Narebski <jnareb@...>, <git@...>
Date: Wednesday, September 10, 2008 - 7:09 pm

Linus Torvalds wrote:


True and still valid.


It does not act differently.

Let me elaborate:

- The origin field is part of the commit (and only present if
  *consciously* added by the committer), and therefore is transmitted
  along with the rest of a commit upon a fetch.

- The commits being referred to by the origin field are *not*
  transmitted upon a fetch.

- Given a repository with 4 long lived published branches called A, B, C and D
  and a backport from development branch D cherry-picked -o into branch A
  which creates an origin field pointing back to (D^,D^^)

- Now you fetch just branch A from this repository.  This will not cause
  branch D to be pulled in as well.

- However, if you explicitly pull D, the origin information from A to D can
  be used.  People doing a generic clone get all four branches, and
  therefore have all the important commits which normally could contain
  origin links.  Note that even during a clone, commits pointed to by
  origin links are not being transmitted (unless there already are other
  reasons to send them along).



Could you spell out one of the common cases where it would do entirely
the wrong thing?
-- 
Sincerely,
           Stephen R. van den Berg.

"Am I paying for this abuse or is it extra?"
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 9:22 am)
Re: [RFC] origin link for cherry-pick and revert, Miklos Vajna, (Wed Sep 10, 4:32 pm)
Re: [RFC] origin link for cherry-pick and revert, Nicolas Pitre, (Wed Sep 10, 4:55 pm)
Re: [RFC] origin link for cherry-pick and revert, Miklos Vajna, (Wed Sep 10, 5:06 pm)
Re: [RFC] origin link for cherry-pick and revert, Petr Baudis, (Tue Sep 9, 5:13 pm)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Wed Sep 10, 4:45 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 6:56 pm)
Re: [RFC] origin link for cherry-pick and revert, Theodore Tso, (Wed Sep 10, 8:21 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Wed Sep 10, 10:16 am)
Re: [RFC] origin link for cherry-pick and revert, Petr Baudis, (Wed Sep 10, 12:40 pm)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Wed Sep 10, 1:58 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Wed Sep 10, 6:44 pm)
Re: [RFC] origin link for cherry-pick and revert, Theodore Tso, (Wed Sep 10, 12:18 pm)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Wed Sep 10, 11:10 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Wed Sep 10, 5:50 pm)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Wed Sep 10, 5:54 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Wed Sep 10, 6:34 pm)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Wed Sep 10, 6:55 pm)
Re: [RFC] origin link for cherry-pick and revert, Nicolas Pitre, (Wed Sep 10, 10:46 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Wed Sep 10, 7:19 pm)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Thu Sep 11, 1:16 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 3:55 am)
Re: [RFC] origin link for cherry-pick and revert, A Large Angry SCM, (Thu Sep 11, 8:33 am)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Thu Sep 11, 4:45 am)
Re: [RFC] origin link for cherry-pick and revert, Petr Baudis, (Tue Sep 9, 7:05 pm)
Re: [RFC] origin link for cherry-pick and revert, and more a..., Stephen R. van den Berg, (Wed Sep 10, 11:15 am)
Re: [RFC] origin link for cherry-pick and revert, and more a..., Stephen R. van den Berg, (Wed Sep 10, 7:49 am)
Re: [RFC] origin link for cherry-pick and revert, and more a..., Stephen R. van den Berg, (Wed Sep 10, 9:14 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 7:32 pm)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Tue Sep 9, 11:44 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 3:43 pm)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Tue Sep 9, 7:35 pm)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Tue Sep 9, 7:59 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 7:58 pm)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Tue Sep 9, 8:23 pm)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Wed Sep 10, 4:30 am)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Wed Sep 10, 11:32 am)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Wed Sep 10, 11:37 am)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Wed Sep 10, 11:43 am)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Wed Sep 10, 11:46 am)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Wed Sep 10, 12:23 pm)
Re: [RFC] origin link for cherry-pick and revert, Sam Vilain, (Thu Sep 11, 7:28 pm)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Thu Sep 11, 7:44 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Fri Sep 12, 1:47 am)
Re: [RFC] origin link for cherry-pick and revert, Theodore Tso, (Fri Sep 12, 10:58 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Fri Sep 12, 11:54 am)
Re: [RFC] origin link for cherry-pick and revert, Sam Vilain, (Mon Sep 15, 8:21 am)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Fri Sep 12, 12:19 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Fri Sep 12, 12:43 pm)
Re: [RFC] origin link for cherry-pick and revert, Theodore Tso, (Fri Sep 12, 2:44 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Fri Sep 12, 4:56 pm)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Fri Sep 12, 11:11 am)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Fri Sep 12, 11:40 am)
Re: [RFC] origin link for cherry-pick and revert, Theodore Tso, (Fri Sep 12, 12:00 pm)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Fri Sep 12, 11:05 am)
Re: [RFC] origin link for cherry-pick and revert, Rogan Dawes, (Fri Sep 12, 2:19 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Fri Sep 12, 2:56 am)
Re: [RFC] origin link for cherry-pick and revert, Sam Vilain, (Thu Sep 11, 10:24 pm)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Wed Sep 10, 11:57 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Wed Sep 10, 7:15 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Wed Sep 10, 1:42 am)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Wed Sep 10, 11:30 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Wed Sep 10, 7:09 pm)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Wed Sep 10, 8:39 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 2:22 am)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Thu Sep 11, 11:39 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 3:23 pm)
Re: [RFC] origin link for cherry-pick and revert, Nicolas Pitre, (Thu Sep 11, 3:45 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 3:55 pm)
Re: [RFC] origin link for cherry-pick and revert, Theodore Tso, (Thu Sep 11, 5:01 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Fri Sep 12, 4:40 am)
Re: [RFC] origin link for cherry-pick and revert, Nicolas Pitre, (Thu Sep 11, 4:27 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Fri Sep 12, 4:50 am)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Thu Sep 11, 12:53 pm)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Thu Sep 11, 12:01 pm)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Thu Sep 11, 12:23 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 4:16 pm)
Re: [RFC] origin link for cherry-pick and revert, A Large Angry SCM, (Thu Sep 11, 8:28 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 8:39 am)
Re: [RFC] origin link for cherry-pick and revert, A Large Angry SCM, (Thu Sep 11, 8:03 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 8:13 pm)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Thu Sep 11, 4:20 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 8:31 am)
Re: [RFC] origin link for cherry-pick and revert, Nicolas Pitre, (Thu Sep 11, 11:02 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 12:00 pm)
Re: [RFC] origin link for cherry-pick and revert, Nicolas Pitre, (Thu Sep 11, 1:02 pm)
Re: [RFC] origin link for cherry-pick and revert, Junio C Hamano, (Thu Sep 11, 5:05 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 6:32 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 6:40 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 2:44 pm)
Re: [RFC] origin link for cherry-pick and revert, Nicolas Pitre, (Thu Sep 11, 4:00 pm)
Re: [RFC] origin link for cherry-pick and revert, Theodore Tso, (Thu Sep 11, 9:51 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 11:32 am)
Re: [RFC] origin link for cherry-pick and revert, Theodore Tso, (Thu Sep 11, 2:00 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 3:03 pm)
Re: [RFC] origin link for cherry-pick and revert, Theodore Tso, (Thu Sep 11, 4:04 pm)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Thu Sep 11, 5:46 pm)
Re: [RFC] origin link for cherry-pick and revert, Linus Torvalds, (Thu Sep 11, 7:10 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 7:36 pm)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Thu Sep 11, 7:26 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 6:56 pm)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Thu Sep 11, 7:01 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 7:17 pm)
Re: [RFC] origin link for cherry-pick and revert, Nicolas Pitre, (Thu Sep 11, 3:33 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 3:44 pm)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Thu Sep 11, 4:05 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 4:22 pm)
Re: [RFC] origin link for cherry-pick and revert, A Large Angry SCM, (Thu Sep 11, 8:30 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Fri Sep 12, 1:39 am)
Re: [RFC] origin link for cherry-pick and revert, Nicolas Pitre, (Thu Sep 11, 4:03 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Thu Sep 11, 4:24 pm)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Tue Sep 9, 4:54 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 7:08 pm)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Tue Sep 9, 3:59 pm)
Re: [RFC] origin link for cherry-pick and revert, Junio C Hamano, (Tue Sep 9, 5:05 pm)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Tue Sep 9, 5:09 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 7:36 pm)
Re: [RFC] origin link for cherry-pick and revert, Junio C Hamano, (Tue Sep 9, 4:42 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 8:13 pm)
Re: [RFC] origin link for cherry-pick and revert, Jeff King, (Tue Sep 9, 4:50 pm)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Tue Sep 9, 6:35 pm)
Re: [RFC] origin link for cherry-pick and revert, Jakub Narebski, (Tue Sep 9, 7:07 pm)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Wed Sep 10, 4:10 am)
Re: [RFC] origin link for cherry-pick and revert, Shawn O. Pearce, (Tue Sep 9, 4:47 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 4:25 pm)
Re: [RFC] origin link for cherry-pick and revert, Steven Grimm, (Tue Sep 9, 12:38 pm)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 9:48 am)
Re: [RFC] origin link for cherry-pick and revert, Paolo Bonzini, (Tue Sep 9, 9:38 am)
Re: [RFC] origin link for cherry-pick and revert, Stephen R. van den Berg, (Tue Sep 9, 10:04 am)