Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master guru-tools by Bor Kraljič (250bebaeb77e6c4ed299b5ea70794ec76ca95753)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master guru-tools by Bor Kraljič (250bebaeb77e6c4ed299b5ea70794ec76ca95753)
  • Date: Sun, 10 Oct 2010 05:40:23 -0500

GIT changes to master guru-tools by Bor Kraljič <pyrobor AT ver.si>:

hashcheck.sh | 4 ++--
smgl-keyring-diff | 9 ++++++++-
2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 250bebaeb77e6c4ed299b5ea70794ec76ca95753
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

smgl-keyring-diff: do all git commands in a branch

This way we don't lose any of the commits that aren't pushed yet. Changes
that
weren't pushed were lost due to "git rebase -q origin master". Due to the
fact
that now all changes are made in a branch master isn't touched and that
temp
branch can simply be discarded (deleted) at the end.

commit 5f1f03d6dbb0244526ce9700cc2c5f62b91720bd
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

hashcheck.sh: fixes the usage message

Changes were made when I implemented use of "getopt". I forgot to update
help

diff --git a/hashcheck.sh b/hashcheck.sh
index 8272f0a..d51a486 100755
--- a/hashcheck.sh
+++ b/hashcheck.sh
@@ -22,8 +22,8 @@ ${MESSAGE_COLOR}\t-s|--section <section>\t to check whole
section
\t-g|--grimoire <grimoire> to check whole grimoire
\t-v|--verbose\t\t show output from summon and verify_file
\t-d|--download\t\t force download of sources
-\t-rf|--remove-failed\t remove sources that are unverified
-\t-ra|--remove-all\t remove all sources after check
+\t-f|--remove-failed\t remove sources that are unverified
+\t-a|--remove-all\t remove all sources after check
\t-h|--help\t\t show this help"
message "$usage"
}
diff --git a/smgl-keyring-diff b/smgl-keyring-diff
index 6532188..207bf05 100755
--- a/smgl-keyring-diff
+++ b/smgl-keyring-diff
@@ -17,6 +17,9 @@ if [ -z $1 ]; then
exit 1
fi

+# lets do all the git work in a branch
+git checkout -q -b $(basename $0)-temp
+
C=$(git log $1 | grep ^commit | wc -l)

echo
@@ -60,6 +63,10 @@ else
fi
echo

-git rebase -q origin master
+# now lets return to master
+git checkout -q master
+
+# we don't need that branch anymore (discard it quietly)
+git branch -D $(basename $0)-temp > /dev/null 2>&1

rm /tmp/$$-B /tmp/$$-A



  • [SM-Commit] GIT changes to master guru-tools by Bor Kraljič (250bebaeb77e6c4ed299b5ea70794ec76ca95753), Bor Kraljič, 10/10/2010

Archive powered by MHonArc 2.6.24.

Top of Page