linux-kernel - Re: why does git perpetually complain about include/asm-blackfin/macros.h?

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20070702142430.GA10400@fiberbit.xs4all.nl>
Date:	Mon, 2 Jul 2007 16:24:30 +0200
From:	Marco Roeland <marco.roeland@...all.nl>
To:	Jesper Juhl <jesper.juhl@...il.com>
Cc:	Jeff Garzik <jeff@...zik.org>,
	"Robert P. J. Day" <rpjday@...dspring.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Git Mailing List <git@...r.kernel.org>,
	Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: why does git perpetually complain about
	include/asm-blackfin/macros.h?

On Monday July 2nd 2007 at 15:58 Jesper Juhl wrote:

> [obnoxious zero sized file include/asm-blackfin/macros.h that gets
>  zapped by toolchains and resurrected again by git]
>
> I've seen that as well, but in my case doing a
> $ git reset --hard master
> fixed it.

Dangerous, as it may overwrite local changes you have! A simple "git
checkout include/asm-blackfin/macros.h" is much safer in this case.

In git commit df30b11 this file got redundant. Perhaps because a normal
patch was applied, instead of with git, the file didn't get deleted from
the repository but truncated to size zero. Not strictly wrong perse, but
for the Linux repository highly unusual (and the only one at that).

Your toolchain perhaps deletes files with zero size after cleaning up or
something. Git then notices that you deleted this file.

Perhaps someone can apply something like the following to finally fix
this up:

commit 7d98740800f3d9ad2428afa8c677be9573a51b7b
Author: Marco Roeland <marco.roeland@...all.nl>
Date:   Mon Jul 2 16:19:49 2007 +0200

    Blackfin arch: remove zero-sized include/asm-blackfin/macros.h

    This file accidentally got truncated instead of deleted in commit df30b11.

    Signed-off-by: Marco Roeland <marco.roeland@...all.nl>

diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h
deleted file mode 100644
index e69de29..0000000
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/