remove INSTALL file to have a clean git status

Submitted by Neels Hofmeyr on July 28, 2016, 4:40 p.m.

Details

Message ID 1469724033-27105-1-git-send-email-nhofmeyr@sysmocom.de
State New
Series "remove INSTALL file to have a clean git status"
Headers show

Commit Message

Neels Hofmeyr July 28, 2016, 4:40 p.m.
From: Neels Hofmeyr <neels@hofmeyr.de>

The INSTALL file is being overwritten by autoreconf, but it is committed
as empty file. As a result, the INSTALL file always shows as modified.
Instead, remove INSTALL from git and ignore it.
---
 .gitignore | 1 +
 INSTALL    | 0
 2 files changed, 1 insertion(+)
 delete mode 100644 INSTALL

diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index e69de29..0000000

Patch hide | download patch | download mbox

diff --git a/.gitignore b/.gitignore
index e15c19b..d1a0b33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@  libtool
 ltmain.sh
 missing
 stamp-h1
+INSTALL
 
 # vim
 *.sw?

Comments

Alexander Chemeris July 30, 2016, 12:19 a.m.
Really good idea. That has been annoying thing.

Please excuse typos. Written with a touchscreen keyboard.

--
Regards,
Alexander Chemeris
CEO Fairwaves, Inc.
https://fairwaves.co

On Jul 28, 2016 12:40, "Neels Hofmeyr" <nhofmeyr@sysmocom.de> wrote:

> From: Neels Hofmeyr <neels@hofmeyr.de>
>
> The INSTALL file is being overwritten by autoreconf, but it is committed
> as empty file. As a result, the INSTALL file always shows as modified.
> Instead, remove INSTALL from git and ignore it.
> ---
>  .gitignore | 1 +
>  INSTALL    | 0
>  2 files changed, 1 insertion(+)
>  delete mode 100644 INSTALL
>
> diff --git a/.gitignore b/.gitignore
> index e15c19b..d1a0b33 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -39,6 +39,7 @@ libtool
>  ltmain.sh
>  missing
>  stamp-h1
> +INSTALL
>
>  # vim
>  *.sw?
> diff --git a/INSTALL b/INSTALL
> deleted file mode 100644
> index e69de29..0000000
> --
> 2.1.4
>
>
Neels Hofmeyr Aug. 8, 2016, 2:49 p.m.
On Fri, Jul 29, 2016 at 08:19:26PM -0400, Alexander Chemeris wrote:
> Really good idea. That has been annoying thing.

Yes -- let me flag it more prominently as an osmo-trx patch, maybe we can have
this merged one day :)

Merging patches to osmo-trx is currently TT's privilege & responsibility,
right? Ah, I also see some commits by Alexander... should I push this myself,
then? (I wonder whether I have push access)

~Neels

> On Jul 28, 2016 12:40, "Neels Hofmeyr" <nhofmeyr@sysmocom.de> wrote:
> 
> > From: Neels Hofmeyr <neels@hofmeyr.de>
> >
> > The INSTALL file is being overwritten by autoreconf, but it is committed
> > as empty file. As a result, the INSTALL file always shows as modified.
> > Instead, remove INSTALL from git and ignore it.
> > ---
> >  .gitignore | 1 +
> >  INSTALL    | 0
> >  2 files changed, 1 insertion(+)
> >  delete mode 100644 INSTALL
> >
> > diff --git a/.gitignore b/.gitignore
> > index e15c19b..d1a0b33 100644
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -39,6 +39,7 @@ libtool
> >  ltmain.sh
> >  missing
> >  stamp-h1
> > +INSTALL
> >
> >  # vim
> >  *.sw?
> > diff --git a/INSTALL b/INSTALL
> > deleted file mode 100644
> > index e69de29..0000000
> > --
> > 2.1.4
> >
> >
Alexander Chemeris Aug. 8, 2016, 6:18 p.m.
I suggest the following procedure which worked well for me:
1. Commit your patches to a branch on top of master.
2. Ping Thomas here or privately about your branch.
3. Repeat (2) until merged.

I don't push to master myself, because Thomas is maintaining it and I don't
want to abuse this.

Please excuse typos. Written with a touchscreen keyboard.

--
Regards,
Alexander Chemeris
CEO Fairwaves, Inc.
https://fairwaves.co

On Aug 8, 2016 5:49 PM, "Neels Hofmeyr" <nhofmeyr@sysmocom.de> wrote:

> On Fri, Jul 29, 2016 at 08:19:26PM -0400, Alexander Chemeris wrote:
> > Really good idea. That has been annoying thing.
>
> Yes -- let me flag it more prominently as an osmo-trx patch, maybe we can
> have
> this merged one day :)
>
> Merging patches to osmo-trx is currently TT's privilege & responsibility,
> right? Ah, I also see some commits by Alexander... should I push this
> myself,
> then? (I wonder whether I have push access)
>
> ~Neels
>
> > On Jul 28, 2016 12:40, "Neels Hofmeyr" <nhofmeyr@sysmocom.de> wrote:
> >
> > > From: Neels Hofmeyr <neels@hofmeyr.de>
> > >
> > > The INSTALL file is being overwritten by autoreconf, but it is
> committed
> > > as empty file. As a result, the INSTALL file always shows as modified.
> > > Instead, remove INSTALL from git and ignore it.
> > > ---
> > >  .gitignore | 1 +
> > >  INSTALL    | 0
> > >  2 files changed, 1 insertion(+)
> > >  delete mode 100644 INSTALL
> > >
> > > diff --git a/.gitignore b/.gitignore
> > > index e15c19b..d1a0b33 100644
> > > --- a/.gitignore
> > > +++ b/.gitignore
> > > @@ -39,6 +39,7 @@ libtool
> > >  ltmain.sh
> > >  missing
> > >  stamp-h1
> > > +INSTALL
> > >
> > >  # vim
> > >  *.sw?
> > > diff --git a/INSTALL b/INSTALL
> > > deleted file mode 100644
> > > index e69de29..0000000
> > > --
> > > 2.1.4
> > >
> > >
>
> --
> - Neels Hofmeyr <nhofmeyr@sysmocom.de>          http://www.sysmocom.de/
> =======================================================================
> * sysmocom - systems for mobile communications GmbH
> * Alt-Moabit 93
> * 10559 Berlin, Germany
> * Sitz / Registered office: Berlin, HRB 134158 B
> * Geschäftsführer / Managing Directors: Harald Welte
>
Tom Tsou Aug. 8, 2016, 6:57 p.m.
On Mon, Aug 8, 2016 at 7:49 AM, Neels Hofmeyr <nhofmeyr@sysmocom.de> wrote:
> On Fri, Jul 29, 2016 at 08:19:26PM -0400, Alexander Chemeris wrote:
>> Really good idea. That has been annoying thing.
>
> Yes -- let me flag it more prominently as an osmo-trx patch, maybe we can have
> this merged one day :)

Merged. And yes, please noticeably flag as osmo-trx.

  -TT