From b46cbb7a08d77f4cd3d06cc969deef8797348a9f Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 24 Jul 2015 08:27:39 -0400 Subject: [PATCH] Revert "Use git format-patch for git snapshots" This reverts commit cfea5d0ea3ecf7386fde25083864c213785c10d6. Turns out this is a bad idea. It doesn't accomplish what I wanted and it seems to confuse git-am. --- scripts/generate-git-snapshot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-git-snapshot.sh b/scripts/generate-git-snapshot.sh index 0107f1bd5..b6fe0d6c1 100755 --- a/scripts/generate-git-snapshot.sh +++ b/scripts/generate-git-snapshot.sh @@ -11,7 +11,7 @@ export NEWGIT=$(($OLDGIT+1)) pushd $LINUX_GIT -git format-patch --stdout v$VER.. > /tmp/patch-$VER-git$NEWGIT +git diff v$VER.. > /tmp/patch-$VER-git$NEWGIT xz -9 /tmp/patch-$VER-git$NEWGIT DESC=$(git describe) popd