From: Peter Osterlund <petero2@telia.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH] stgit: Handle 'A' flag for new files
Date: 28 Jul 2005 13:55:46 +0200 [thread overview]
Message-ID: <m3d5p3kuv1.fsf@telia.com> (raw)
Hi,
Patches that add new files don't work correctly if git reports them
with the 'A' flag. StGIT claims there are unresolved conflicts. This
patch fixes it.
Signed-off-by: Peter Osterlund <petero2@telia.com>
diff --git a/stgit/git.py b/stgit/git.py
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -274,7 +274,7 @@ def commit(message, files = [], parents
raise GitException, 'No changes to commit'
# check for unresolved conflicts
- if not first and len(filter(lambda x: x[0] not in ['M', 'N', 'D'],
+ if not first and len(filter(lambda x: x[0] not in ['M', 'N', 'A', 'D'],
cache_files)) != 0:
raise GitException, 'Commit failed: unresolved conflicts'
--
Peter Osterlund - petero2@telia.com
http://web.telia.com/~u89404340
next reply other threads:[~2005-07-28 11:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-28 11:55 Peter Osterlund [this message]
2005-07-28 12:20 ` [PATCH] stgit: Handle 'A' flag for new files Catalin Marinas
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=m3d5p3kuv1.fsf@telia.com \
--to=petero2@telia.com \
--cc=catalin.marinas@gmail.com \
--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.
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).