Git development
 help / color / mirror / Atom feed
From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: David Jeske <jeske@google.com>
Cc: Jakub Narebski <jnareb@gmail.com>,
	Avery Pennarun <apenwarr@gmail.com>, Nicolas Pitre <nico@cam.org>,
	git@vger.kernel.org
Subject: Re: why is git destructive by default? (i suggest it not be!)
Date: Tue, 24 Jun 2008 10:35:17 +0200	[thread overview]
Message-ID: <20080624083517.GA14185@atjola.homenet> (raw)

On 2008.06.24 08:08:13 -0000, David Jeske wrote:
> To re-ask the same question I asked in my last post, using your ascii
> pictures...
> 
> 
> Let's assume we're here..
> 
> .<---.<---.<---A<---X<---Y    <--- master
> \
> \--B<---C    <--- customer_A_branch <=== HEAD
> 
> 
> And this person and everyone else moves their head pointers back to master
> without merging:
> 
> 
> .<---.<---.<---A<---X<---Y    <--- master              <=== HEAD
> \
> \--B<---C    <--- customer_A_branch
> 
> 
> Now, five years down the road, our tree looks like:
> 
> 
> .<---A<---X<---Y<---.<--.<--.(3 years of changes)<---ZZZ<--- master  <=== HEAD
> \
> \--B<---C   <--- customer_A_branch
> 
> And someone does:
> 
> git-branch -f customer_A_branch ZZZ
> 
> To bring us to:
> 
> .<---A<---X<---Y<---.<--.(3 years of changes)<---ZZZ<--- master  <=== HEAD
> \                                           \
> \--B<---C                                   \-- customer_A_branch
> 
> 
> ..at this point, will a GC keep "B<--C", or garbage collect the commits and
> throw them away?

That would throw away the changes in _that_ repository after the reflog
entry has expired. It would not affect any other repo yet, and if that
developer tries to push that new customer_A_branch, it would be refused,
because it is not a fast-forward. And if the repo he's trying to push to
simply doesn't allow any non-fast-forward pushes, then even push -f
won't help him to destroy anything.

Björn

             reply	other threads:[~2008-06-24  8:36 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-24  8:35 Björn Steinbrink [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-06-25 18:06 why is git destructive by default? (i suggest it not be!) Dmitry Potapov
2008-06-24 12:21 Olivier Galibert
     [not found] <willow-jeske-01l5PFjPFEDjCfzf-01l5oEswFEDjCZBN>
     [not found] ` <willow-jeske-01l5oEsvFEDjCjRW>
2008-06-24 10:42   ` David Jeske
2008-06-24 10:42   ` David Jeske
2008-06-24 15:29     ` Brandon Casey
2008-06-24 16:41       ` David Jeske
2008-06-24 18:55         ` Brandon Casey
2008-06-25 12:20         ` Matthieu Moy
2008-06-25 17:56         ` Jing Xue
2008-06-24 16:41       ` David Jeske
2008-06-24  4:59 Teemu Likonen
     [not found] ` <e80d075a0806232201o3933d154he2b570986604c30a@mail.gmail.com>
2008-06-24  5:43   ` Teemu Likonen
     [not found] <willow-jeske-01l5PFjPFEDjCfzf-01l5V7wbFEDjCX7V>
     [not found] ` <jeske@willow=01l5V7waFEDjChmh>
2008-06-24  1:47   ` David Jeske
2008-06-24 17:11     ` Boaz Harrosh
2008-06-24 17:19       ` Boaz Harrosh
2008-06-24 19:08         ` Jakub Narebski
2008-06-24 20:04           ` David Jeske
2008-06-24 21:42             ` Brandon Casey
2008-06-24 22:13               ` David Jeske
2008-06-24 22:13               ` David Jeske
2008-06-24 22:54               ` Theodore Tso
2008-06-24 23:07                 ` Junio C Hamano
2008-06-25  2:26                   ` Theodore Tso
2008-06-25  8:58                     ` Jakub Narebski
2008-06-25  9:14                       ` Junio C Hamano
2008-06-26 15:13                     ` Brandon Casey
2008-06-24 22:21             ` Steven Walter
2008-06-24 20:04           ` David Jeske
2008-06-25  8:57           ` Boaz Harrosh
2008-06-24 18:18       ` Brandon Casey
2008-06-24  1:47   ` David Jeske
     [not found]   ` <willow-jeske-01l5PFjPFEDjCfzf-01l5V7wbFEDjCX7V@videotron.ca>
     [not found]     ` <willow-jeske-01l5cKsCFEDjC=91MX@videotron.ca>
2008-06-24  2:17       ` Nicolas Pitre
2008-06-24  3:18         ` David Jeske
2008-06-24  8:14           ` Lea Wiemann
2008-06-24  3:18         ` David Jeske
     [not found]         ` <willow-jeske-01l5PFjPFEDjCfzf-01l5ciVtFEDjCaD9@videotron.ca>
     [not found]           ` <willow-jeske-01l5e9cgFEDjCh3F@videotron.ca>
2008-06-24  4:03             ` Nicolas Pitre
2008-06-24  4:40               ` David Jeske
2008-06-24  5:24                 ` Jan Krüger
2008-06-24  4:40               ` David Jeske
     [not found]               ` <1978205964779154253@unknownmsgid>
2008-06-24  5:20                 ` Avery Pennarun
2008-06-24  6:35                   ` David Jeske
2008-06-24  7:24                     ` Jeff King
2008-06-24  7:31                       ` David Jeske
2008-06-24  7:31                       ` David Jeske
2008-06-24  8:16                         ` Jeff King
2008-06-24  8:30                           ` David Jeske
2008-06-24  8:30                           ` David Jeske
2008-06-24  9:39                             ` Jakub Narebski
     [not found]                           ` <willow-jeske-01l5PFjPFEDjCfzf-01l5kv6TFEDjCj8S@brm-avmta-1.central.sun.com>
     [not found]                             ` <willow-jeske-01l5lTEoFEDjCVta@brm-avmta-1.central.sun.com>
2008-06-24 10:01                               ` Fedor Sergeev
2008-06-24 10:24                                 ` David Jeske
2008-06-24 13:13                                   ` Theodore Tso
2008-06-24  6:35                   ` David Jeske
2008-06-24  7:54                   ` Jakub Narebski
2008-06-24  8:08                     ` David Jeske
2008-06-24 11:22                       ` Jakub Narebski
2008-06-24 11:29                         ` David Jeske
2008-06-24 12:19                           ` Rogan Dawes
2008-06-24 12:35                             ` Johannes Gilger
2008-06-24 12:46                               ` Rogan Dawes
2008-06-24 11:29                         ` David Jeske
2008-06-24 12:21                           ` Jakub Narebski
2008-06-24 12:13                         ` Jakub Narebski
2008-06-24  8:08                     ` David Jeske

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080624083517.GA14185@atjola.homenet \
    --to=b.steinbrink@gmx.de \
    --cc=apenwarr@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jeske@google.com \
    --cc=jnareb@gmail.com \
    --cc=nico@cam.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox