Re: [PATCH] install: add -C option to install file only when necessary

[Jim Meyering]

Eric Blake <address@hidden> wrote:
> According to Jim Meyering on 2/17/2009 11:41 PM:
>> Eric Blake <address@hidden> wrote:
>>> OK for this followup, necessary on cygwin and a no-op for most other
>>> platforms?
>
> Pushed.
>
>>>  Also, some of the files created by the patch are listed as
>>> copyright 2008 (when they were first started), rather than 2009 (when they 
>>> were
>>> published).
>>
>> Sure.  Thanks!
>>
>> We could use a git hook that verifies copyright dates.
>> If you'd like to fix them, then please do.
>
> I used git log to find the first commit this year, then using this list:
>
> $ grep -L 2009 `git diff --stat 1ead0.. | head -n -1 | cut -d\| -s -f1`

Good idea.

> I came up with the following patch, also applied.  I didn't touch files

Thanks!

> where the author date was last year, or files that didn't have a copyright
> to begin with, so the above command still turns out a sizable list of
> files.  Some of those files, like tests/test-lib.sh or HACKING, probably
> deserve a copyright notice.

Good point.  I've added them, along with a note to HACKING
about how better to handle accidental initial commit(s) to master:


>From 820595fc9ac6596f3181a0eea2a5c3bc87401497 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 18 Feb 2009 14:34:23 +0100
Subject: [PATCH 1/2] add copyright notices

* HACKING: Add copyright notice.
* tests/test-lib.sh: Likewise.
---
 HACKING           |   10 ++++++++++
 tests/test-lib.sh |   15 +++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/HACKING b/HACKING
index 2869c03..f6d878f 100644
--- a/HACKING
+++ b/HACKING
@@ -408,3 +408,13 @@ to generate HTML coverage reports.  Follow these steps:

 Then just open the index.html file (in the generated lcov-html directory)
 in your favorite web browser.
+
+========================================================================
+Copyright (C) 2009 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the ``GNU Free
+Documentation License'' file as part of this distribution.
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index 845c452..cf90b44 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -1,5 +1,20 @@
 # source this file; set up for tests

+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # Skip this test if the shell lacks support for functions.
 unset function_test
 eval 'function_test() { return 11; }; function_test'
--
1.6.2.rc1.209.gfe624


>From f49eb8b031bc72354fb1867a8ada554beaa827eb Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 18 Feb 2009 14:50:04 +0100
Subject: [PATCH 2/2] * HACKING: Explain how to recover if you've committed 
changes to master.

---
 HACKING |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/HACKING b/HACKING
index f6d878f..bf9a45e 100644
--- a/HACKING
+++ b/HACKING
@@ -32,9 +32,14 @@ inside your new coreutils/ directory:
 If you have made *no* changes:
     git pull

-If you *have* made changes and committed them to "master", do this:
-    git fetch
-    git rebase origin
+If you *have* made changes and mistakenly committed them to "master",
+do the following to put your changes on a private branch, "br", and
+to restore master to its unmodified (relative-to-upstream) state:
+    git checkout -b br
+    git checkout master
+    git reset --hard origin
+
+Then "git pull" should work.


 *Before* you commit changes
--
1.6.2.rc1.209.gfe624