git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Erick Mattos <erick.mattos@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git checkout -b: unparent the new branch with -o
Date: Wed, 24 Feb 2010 19:23:16 -0300	[thread overview]
Message-ID: <55bacdd31002241423i10ee177cnda545c9aac071b39@mail.gmail.com> (raw)
In-Reply-To: <7viq9nfwg8.fsf@alter.siamese.dyndns.org>

Erick Mattos <erick.mattos@gmail.com> writes:

> A good example to show the need of this option is a Debian folder of control
> files.  Whenever a maintainer needs to debianize a source code to build
> packages he needs to add a folder called Debian with a lot of files inside it.
> Those files are connected to the source code of the program but they are not
> really part of the program development.  On this situation using the new
> option, that maintainer would do:
>
>       git checkout -ob debian
>       git clean -df
>       mkdir Debian
>       add all control files
>       ...hack it enough...
>       git add Debian
>       git commit

I do not think that is a good example.

If you have an extract of an upstream tarball, say frotz-1.42.tar.gz, and
you are not porting anything older than that version, why not have two
branches, frotz and master, and do things this way?

 - frotz (or "vanilla" or "upstream") that keeps track of the "vendor
  drop" without debian/ directory;

 - master that forks from frotz and adds "debian/" and nothing else; and

 - any other topic branches that either fork from frotz if you are fixing
  upstream bug (or enhancing the vanilla version), or fork from master if
  you are fixing or enhancing the debianization.

When you receive frotz-1.43.tar.gz, you will advance 'frotz' branch with
it, and probably fork maint-1.42 branch from master so that you can keep
supporting older debianized frotz, while merging frotz into master so that
you can prepare a debianized version of newer package.

Your debianization will _never_ be totally independent of the vendor
version, so there is no good reason to have it as a rootless branch.

  reply	other threads:[~2010-02-24 22:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-23 21:20 [PATCH] git checkout -b: unparent the new branch with -o Erick Mattos
2010-02-23 21:56 ` Junio C Hamano
2010-02-24 22:23   ` Erick Mattos [this message]
2010-02-24 22:40     ` Erick Mattos
2010-02-24 22:27   ` Erick Mattos
2010-02-23 23:26 ` Jakub Narebski
     [not found]   ` <55bacdd31002241410h747ae221xd72dfcf269bdb84e@mail.gmail.com>
2010-02-24 22:14     ` Erick Mattos

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=55bacdd31002241423i10ee177cnda545c9aac071b39@mail.gmail.com \
    --to=erick.mattos@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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;
as well as URLs for NNTP newsgroup(s).