Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and
[fs/lustre-release.git]
/
lustre
/
scripts
/
land1.sh
diff --git
a/lustre/scripts/land1.sh
b/lustre/scripts/land1.sh
index
c3a0468
..
16f6b20
100755
(executable)
--- a/
lustre/scripts/land1.sh
+++ b/
lustre/scripts/land1.sh
@@
-36,7
+36,7
@@
case $child in
*) child="b_$child"
esac
-if [ "$parent" != "HEAD" -a "`cat CVS/Tag
2> /dev/null
`" != "T$parent" ]; then
+if [ "$parent" != "HEAD" -a "`cat CVS/Tag`" != "T$parent" ]; then
echo "This script must be run within the $parent branch"
exit 1
fi