Merge branch 'master' of feistymeow.org:feisty_meow

[feisty_meow.git] / scripts / rev_control / rfluffer.sh

diff --git a/scripts/rev_control/rfluffer.sh b/scripts/rev_control/rfluffer.sh
new file mode 100644 (file)
index 0000000..b5de908
--- /dev/null
+++ b/scripts/rev_control/rfluffer.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# this "fluffs out" the repositories that it finds.  what this means is that
+# any git repositories found will have all of their remote state updated (by
+# pulling all remote repos).  this ensures that any upstream changes get
+# merged into the local branch.
+# it's better to fluff out your code regularly rather than waiting for a huge
+# merge snarl later.  note that if you check in the code frequently with the
+# feisty meow scripts, that will also take care of fluffing out the code.
+
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
+
+##############
+
+dir="$1"; shift
+if [ -z "$dir" ]; then
+  dir=.
+fi
+
+pushd "$dir" &>/dev/null
+test_or_die "changing to directory: $dir"
+tempfile=$(generate_rev_ctrl_filelist)
+test_or_die "generating revision control file list"
+popd &>/dev/null
+
+perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+test_or_die "fluffing out repository at: $tempfile"
+