[kernel] Make generate-git-snapshot.sh work for merge window trees

[Josh Boyer]

commit 79b876cd70369849dfb59f1cb11dee32a3ea303a
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Jul 31 12:16:26 2012 -0400

    Make generate-git-snapshot.sh work for merge window trees
    
    Use sed to drop anything ending in -git.*.  That allows us to grab the version
    information for the main tree while -rc* will still work later.

 scripts/generate-git-snapshot.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/generate-git-snapshot.sh b/scripts/generate-git-snapshot.sh
index 618d80c..239b846 100755
--- a/scripts/generate-git-snapshot.sh
+++ b/scripts/generate-git-snapshot.sh
@@ -2,7 +2,7 @@
 #
 # Set LINUX_GIT to point to an upstream Linux git tree in your .bashrc or wherever.
 
-VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/.xz//)
+VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz//)
 
 OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //)
 export NEWGIT=$(($OLDGIT+1))