| Message ID | 1358715858-4469-7-git-send-email-gene@czarc.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jan 20, 2013 at 04:04:11PM -0500, Gene Czarcinski wrote: > remove extra blank line at EOF The patch contents and description do not match. > --- a/man/Makefile > +++ b/man/Makefile > @@ -1,4 +1,4 @@ > -GZIP=gzip > +GZIPCMD=gzip I'm not sure if this change is needed, does it stick to some well-known or established style in makefiles? david -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/21/2013 11:46 AM, David Sterba wrote: > On Sun, Jan 20, 2013 at 04:04:11PM -0500, Gene Czarcinski wrote: >> remove extra blank line at EOF > The patch contents and description do not match. First of all, this patch should have been 2 separate patches. Too late to fix that. The patch which created btrfs-show-super.c had an extra line at the end and I got annoyed at git-am complaining about it. This first patch fixes that. This should have been a separate commit. The other patch (which should have been its own commit) addresses this problem: http://www.mail-archive.com/linux-btrfs@vger.kernel.org/msg19264.html I could not see that it did any harm and it helped on at least one system type I am not sure how it happened that I combined them. If you want, I will resubmit them the way it should be ... two separate patches with two separate commits. Gene > >> --- a/man/Makefile >> +++ b/man/Makefile >> @@ -1,4 +1,4 @@ >> -GZIP=gzip >> +GZIPCMD=gzip > I'm not sure if this change is needed, does it stick to some well-known > or established style in makefiles? > > david > > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
This is the patch that "6 of 13" should have been and was not. Here is the original posting: http://www.mail-archive.com/linux-btrfs@vger.kernel.org/msg19264.html Christian Hesse (1): fix btrfs-progs build man/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
On Tue, Jan 22, 2013 at 01:00:56PM -0500, Gene Czarcinski wrote: > The patch which created btrfs-show-super.c had an extra line at the end and > I got annoyed at git-am complaining about it. This first patch fixes that. > This should have been a separate commit. No need to send separate patches for whitespaces if the number of places to fix is small. > The other patch (which should have been its own commit) addresses this > problem: > http://www.mail-archive.com/linux-btrfs@vger.kernel.org/msg19264.html > > I could not see that it did any harm and it helped on at least one system > type Now I remember I saw that patch fly by; added to the queue. david -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/btrfs-show-super.c b/btrfs-show-super.c index a9e2524..7c66d84 100644 --- a/btrfs-show-super.c +++ b/btrfs-show-super.c @@ -281,4 +281,3 @@ static void dump_superblock(struct btrfs_super_block *sb) printf("dev_item.generation\t%llu\n", (unsigned long long) btrfs_stack_device_generation(&sb->dev_item)); } - diff --git a/man/Makefile b/man/Makefile index 4a90b75..f7b57f7 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,4 +1,4 @@ -GZIP=gzip +GZIPCMD=gzip INSTALL= install prefix ?= /usr/local @@ -12,22 +12,22 @@ MANPAGES = mkfs.btrfs.8.gz btrfsctl.8.gz btrfsck.8.gz btrfs-image.8.gz \ all: $(MANPAGES) mkfs.btrfs.8.gz: mkfs.btrfs.8.in - $(GZIP) -n -c mkfs.btrfs.8.in > mkfs.btrfs.8.gz + $(GZIPCMD) -n -c mkfs.btrfs.8.in > mkfs.btrfs.8.gz btrfs.8.gz: btrfs.8.in - $(GZIP) -n -c btrfs.8.in > btrfs.8.gz + $(GZIPCMD) -n -c btrfs.8.in > btrfs.8.gz btrfsctl.8.gz: btrfsctl.8.in - $(GZIP) -n -c btrfsctl.8.in > btrfsctl.8.gz + $(GZIPCMD) -n -c btrfsctl.8.in > btrfsctl.8.gz btrfsck.8.gz: btrfsck.8.in - $(GZIP) -n -c btrfsck.8.in > btrfsck.8.gz + $(GZIPCMD) -n -c btrfsck.8.in > btrfsck.8.gz btrfs-image.8.gz: btrfs-image.8.in - $(GZIP) -n -c btrfs-image.8.in > btrfs-image.8.gz + $(GZIPCMD) -n -c btrfs-image.8.in > btrfs-image.8.gz btrfs-show.8.gz: btrfs-show.8.in - $(GZIP) -n -c btrfs-show.8.in > btrfs-show.8.gz + $(GZIPCMD) -n -c btrfs-show.8.in > btrfs-show.8.gz clean : rm -f $(MANPAGES)
remove extra blank line at EOF Signed-off-by: Gene Czarcinski <gene@czarc.net> --- btrfs-show-super.c | 1 - man/Makefile | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)