summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-07-24 08:26:40 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-07-24 08:26:40 -0400
commit2e4a6e0c85c04dfc705882ffea3b3d6dc0ebeea7 (patch)
treee3c47176cfd8a439aebaecf0eea45d3ce1026b95 /scripts
parente2a71e13fbd37490b96381073302a4a621373e49 (diff)
downloadkernel-2e4a6e0c85c04dfc705882ffea3b3d6dc0ebeea7.tar.gz
kernel-2e4a6e0c85c04dfc705882ffea3b3d6dc0ebeea7.tar.xz
kernel-2e4a6e0c85c04dfc705882ffea3b3d6dc0ebeea7.zip
Revert "Use git format-patch for git snapshots"
This reverts commit 6c6695315365a1fa3ccce27070db0699bb4f5c26. Turns out this is a bad idea. It doesn't accomplish what I wanted and it seems to confuse git-am.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/generate-git-snapshot.sh2
1 files changed, 1 insertions, 1 deletions
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