From: Catalin Marinas <catalin.marinas@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org
Subject: Re: [StGit PATCH 1/5] Check for local changes with "goto"
Date: Tue, 17 Mar 2009 10:51:08 +0000 [thread overview]
Message-ID: <b0943d9e0903170351p319bad36icf8252610e5c4f05@mail.gmail.com> (raw)
In-Reply-To: <20090317070654.GA3716@diana.vm.bytemark.co.uk>
2009/3/17 Karl Hasselström <kha@treskal.com>:
> On 2009-03-16 14:56:11 +0000, Catalin Marinas wrote:
>> if not iw.worktree_clean():
>> self.__halt('Worktree not clean. Use "refresh" or "status --reset"')
>> if not iw.index.is_clean(self.stack.head):
>> self.__halt('Index not clean. Use "refresh" or "status --reset"')
[...]
> Your version doesn't generate the "Your index and worktree are both
> dirty" warning, but I guess that's OK.
The iw.worktree_clean() only checks whether the worktree is clean
relative to the index (I just tried "git update-index --refresh" after
"git add <modified file>" and it returns 0).
--
Catalin
next prev parent reply other threads:[~2009-03-17 10:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-12 12:08 [StGit PATCH 0/5] Various StGit patches Catalin Marinas
2009-03-12 12:08 ` [StGit PATCH 1/5] Check for local changes with "goto" Catalin Marinas
2009-03-13 1:57 ` Karl Hasselström
2009-03-16 14:56 ` Catalin Marinas
2009-03-17 7:06 ` Karl Hasselström
2009-03-17 10:51 ` Catalin Marinas [this message]
2009-03-17 13:36 ` Karl Hasselström
2009-03-12 12:09 ` [StGit PATCH 2/5] Add mergetool support to the classic StGit infrastructure Catalin Marinas
2009-03-13 2:02 ` Karl Hasselström
2009-03-12 12:09 ` [StGit PATCH 3/5] Add automatic git-mergetool invocation to the new infrastructure Catalin Marinas
2009-03-13 2:17 ` Karl Hasselström
2009-03-16 15:03 ` Catalin Marinas
2009-03-17 7:12 ` Karl Hasselström
2009-03-12 12:09 ` [StGit PATCH 4/5] Convert "sink" " Catalin Marinas
2009-03-13 2:27 ` Karl Hasselström
2009-03-12 12:09 ` [StGit PATCH 5/5] Convert "float" to the lib infrastructure Catalin Marinas
2009-03-13 2:41 ` Karl Hasselström
2009-03-16 16:36 ` Catalin Marinas
2009-03-17 7:16 ` Karl Hasselström
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=b0943d9e0903170351p319bad36icf8252610e5c4f05@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.