From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Joshua Jensen <jjensen@workspacewhiz.com>
Subject: [PATCH 1/2] sh-setup: Write a new require_clean_work_tree function
Date: Sun, 26 Sep 2010 20:51:55 +0530 [thread overview]
Message-ID: <1285514516-5112-2-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <4C9E07B1.50600@workspacewhiz.com>
Write a new require_clean_work_tree function to error out when working
tree contains unstaged changes or index contains uncommitted changes.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
git-sh-setup.sh | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 6131670..3a337da 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -145,6 +145,29 @@ require_work_tree () {
die "fatal: $0 cannot be used without a working tree."
}
+require_clean_work_tree () {
+ # Update the index
+ git update-index -q --ignore-submodules --refresh
+
+ # Disallow unstaged changes in the working tree
+ if ! git diff-files --quiet --ignore-submodules --
+ then
+ echo >&2 "cannot $1: you have unstaged changes."
+ echo >&2 "Please commit or stash them."
+ git diff-files --name-status -r --ignore-submodules -- >&2
+ exit 1
+ fi
+
+ # Disallow uncommitted changes in the index
+ if ! git diff-index --cached --quiet --ignore-submodules HEAD --
+ then
+ echo >&2 "cannot $1: your index contains uncommitted changes."
+ echo >&2 "Please commit or stash them."
+ git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
+ exit 1
+ fi
+}
+
get_author_ident_from_commit () {
pick_author_script='
/^author /{
--
1.7.2.2.409.gdbb11.dirty
next prev parent reply other threads:[~2010-09-26 15:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-25 5:18 What exactly does 'needs update' mean? Joshua Jensen
2010-09-25 6:06 ` Junio C Hamano
2010-09-25 14:16 ` Joshua Jensen
2010-09-25 14:31 ` Joshua Jensen
2010-09-26 15:21 ` [PATCH 0/2] Eliminate cryptic "needs update" error message Ramkumar Ramachandra
2010-09-26 15:21 ` Ramkumar Ramachandra [this message]
2010-09-26 16:28 ` [PATCH 1/2] sh-setup: Write a new require_clean_work_tree function Matthieu Moy
2010-09-26 17:39 ` Ramkumar Ramachandra
2010-09-26 18:46 ` Matthieu Moy
2010-09-26 18:51 ` Ramkumar Ramachandra
2010-09-26 15:21 ` [PATCH 2/2] Porcelain scripts: Rewrite cryptic "needs update" error message Ramkumar Ramachandra
2010-09-26 16:31 ` Matthieu Moy
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285514516-5112-2-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jjensen@workspacewhiz.com \
--cc=jrnieder@gmail.com \
/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.
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 NNTP newsgroup(s).