diff options
author | Andy Whitcroft <apw@canonical.com> | 2012-02-16 18:27:25 +0000 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2012-06-25 15:02:21 -0600 |
commit | d5ceb831cb130b3bcef202af9452db38ceb382ee (patch) | |
tree | 30d367423e4681aafe1123e4ce8c61318bd5f73a | |
parent | ff742a4061a69e24923a5135e3936579d9039cbf (diff) |
UBUNTU: ubuntu: AUFS -- adapt to the new changelog handling
Signed-off-by: Andy Whitcroft <apw@canonical.com>
-rwxr-xr-x[-rw-r--r--] | ubuntu/aufs-update | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ubuntu/aufs-update b/ubuntu/aufs-update index 5b4b5a6daef..796ae1d471a 100644..100755 --- a/ubuntu/aufs-update +++ b/ubuntu/aufs-update @@ -12,8 +12,8 @@ aufs="$1" # Get the current tip name { read x url - read x o_tip_sha1 read x o_log_sha1 + read x o_tip_sha1 } <aufs/BOM # Identify the tip of the standalone tree for reporting @@ -29,8 +29,8 @@ git checkout -f HEAD -- aufs/BOM aufs/BOM.UPDATING # Reinsert the include update. #sed -i -e '1iEXTRA_CFLAGS += -I$(src)/include' aufs/Makefile -# Find the latest commit in the ChangeLog. -read x n_log_sha1 <"$aufs/ChangeLog" +## # Find the latest commit in the ChangeLog. +## read x n_log_sha1 <"$aufs/ChangeLog" # Insert the new commit ID and commit the result. sed -i -e "s/^COMMIT: .*/COMMIT: $n_tip_sha1/" aufs/BOM @@ -39,8 +39,9 @@ git add aufs include/linux { echo "UBUNTU: ubuntu: AUFS -- update to $n_tip_sha1" echo "" - awk <"$aufs/ChangeLog" ' - /^commit '"$o_log_sha1"'/ { exit } - { print " " $0 } - ' + (cd "$aufs" && git log --no-merges "$o_tip_sha1..$n_tip_sha1" | git shortlog) +## awk <"$aufs/ChangeLog" ' +## /^commit '"$o_log_sha1"'/ { exit } +## { print " " $0 } +## ' } | git commit -s -F - |