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: <46890DA8.4070400@garzik.org>
Date:	Mon, 02 Jul 2007 10:37:28 -0400
From:	Jeff Garzik <jeff@...zik.org>
To:	Alex Riesen <raa.lkml@...il.com>
CC:	Jesper Juhl <jesper.juhl@...il.com>,
	"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>,
	Sam Ravnborg <sam@...nborg.org>
Subject: Re: why does git perpetually complain about include/asm-blackfin/macros.h?

Alex Riesen wrote:
> Do some of your branches miss the commit by which it was removed?

git-clone followed by git-checkout master recreates the problem.

But to answer your question directly, I rebase, so they absolutely do 
not miss any commits.


> It is somewhat unclear what "reappear" means, though: do you mean

Attempts to give you precise output to answer your question yielded a 
data point, the kernel's "make distclean" causes this:

[jgarzik@...tzel linux-2.6]$ make distclean && git checkout master && 
git diff HEAD
D       include/asm-blackfin/macros.h
Switched to branch "master"
diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h
deleted file mode 100644
index e69de29..0000000

[jgarzik@...tzel linux-2.6]$ git checkout -f

[jgarzik@...tzel linux-2.6]$ make distclean && git checkout master && 
git diff HEAD
D       include/asm-blackfin/macros.h
Switched to branch "master"
diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h
deleted file mode 100644
index e69de29..0000000

[jgarzik@...tzel linux-2.6]$ git checkout -f

[jgarzik@...tzel linux-2.6]$ git checkout master && git diff 
HEADSwitched to branch "master"

[jgarzik@...tzel linux-2.6]$ git checkout master && git diff HEAD
Switched to branch "master"

[jgarzik@...tzel linux-2.6]$


So, not a git problem but a kernel Makefile problem.  Sorry for the git 
noise.

	Jeff


-
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/