From: Patrick Lehmann <Patrick.Lehmann@plc2.de>
To: Git Mailinglist <git@vger.kernel.org>
Subject: Restoring detached HEADs after Git operations
Date: Mon, 19 Jun 2017 08:46:45 +0000 [thread overview]
Message-ID: <0092CDD27C5F9D418B0F3E9B5D05BE08010287DF@SBS2011.opfingen.plc2.de> (raw)
Hello,
I wrote a Bash script to recover branch names after Git operations have create detached HEADs in a Git repository containing lots of Git submodules. The script works recursively.
I would like to see:
a) that script or algorithm being integrated into Git by default
b) that as a default behavior for all Git operations creating detached HEADs
That's the command:
--------------------------------
git submodule foreach --recursive 'HEAD=$(git branch --list | head -n 1); if [[ "$HEAD" == *HEAD* ]]; then REF=$(git rev-parse HEAD); FOUND=0; for Branch in $(git branch --list | grep "^ " | sed -e "s/ //" ); do if [[ "$(git rev-parse "$Branch")" == $REF ]]; then echo -e " \e[36mCheckout $Branch...\e[0m"; git checkout $Branch; FOUND=1; break; fi done; if [[ $FOUND -eq 0 ]]; then echo -e " \e[31mNo matching branch found.\e[0m"; fi else echo -e " \e[36mNothing to do.\e[0m"; fi'
--------------------------------
How does it work:
1. It uses git submodule foreach to dive into each Git submodule and execute a series of Bash commands.
2. It's reading the list of branches and checks if the submodule is in detached mode. The first line contains the string HEAD.
3. Retrieve the hash of the detached HEAD
4. Iterate all local branches and get their hashes
5. Compare the branch hashes with the detached HEAD's hash. If it matches do a checkout.
6. Report if no branch name was found or if a HEAD was not in detached mode.
The Bash code with line breaks and indentation:
--------------------------------
HEAD=$(git branch --list | head -n 1)
if [[ "$HEAD" == *HEAD* ]]; then
REF=$(git rev-parse HEAD)
FOUND=0
for Branch in $(git branch --list | grep "^ " | sed -e "s/ //" ); do
if [[ "$(git rev-parse "$Branch")" == $REF ]]; then
echo -e " \e[36mCheckout $Branch...\e[0m"
git checkout $Branch
FOUND=1
break
fi
done
if [[ $FOUND -eq 0 ]]; then
echo -e " \e[31mNo matching branch found.\e[0m"
fi
else
echo -e " \e[36mNothing to do.\e[0m"
fi
--------------------------------
Are their any chances to get it integrated into Git?
I tried to register that code as a Git alias, but git config complains about quote problem not showing where. It neither specifies if it's a single or double quote problem. Any advice on how to register that piece of code as an alias?
If wished, I think I could expand the script to also recover hash values to Git tags if no branch was found.
Kind regards
Patrick Lehmann
next reply other threads:[~2017-06-19 8:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-19 8:46 Patrick Lehmann [this message]
2017-06-19 9:30 ` Restoring detached HEADs after Git operations Lars Schneider
2017-06-19 9:52 ` AW: " Patrick Lehmann
2017-06-19 16:37 ` Stefan Beller
2017-06-19 17:34 ` AW: " Patrick Lehmann
2017-06-19 17:47 ` Stefan Beller
2017-06-19 18:09 ` AW: " Patrick Lehmann
2017-06-19 19:21 ` Stefan Beller
2017-06-19 20:13 ` AW: " Patrick Lehmann
2017-06-19 17:55 ` Junio C Hamano
2017-06-19 19:11 ` Stefan Beller
2017-06-19 16:31 ` Stefan Beller
2017-06-19 17:01 ` Jeff King
2017-06-19 17:56 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0092CDD27C5F9D418B0F3E9B5D05BE08010287DF@SBS2011.opfingen.plc2.de \
--to=patrick.lehmann@plc2.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).