Format stash branch names properly.

qw3rtman · Jul 4, 2016 · 3024c23 · 3024c23
1 parent 1a0ce5d
commit 3024c23
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/git-fire b/git-fire
@@ -23,10 +23,12 @@ user_email() {
 }
 
 new_branch() {
-	echo "fire-$(current_branch)-$(user_email)-$(current_epoch)"
+	echo "fire-${1:-$(current_branch)}-$(user_email)-$(current_epoch)"
 }
 
 fire() {
+	initial_branch="$(current_branch)"
+
 	git checkout -b "$(new_branch)"
 
 	# cd to git root directory
@@ -47,7 +49,7 @@ fire() {
 	done
 
 	for sha in $(git rev-list -g stash); do
-		git push origin "$sha":refs/heads/stash_"$sha"
+		git push origin "$sha":refs/heads/"$(current_branch $initial_branch)"-stash-"$sha"
 	done
 
 	printf "\n\nLeave building!\n"