diff options
author | Owen W. Taylor <otaylor@fishsoup.net> | 2010-06-05 10:08:36 -0400 |
---|---|---|
committer | Owen W. Taylor <otaylor@fishsoup.net> | 2010-06-05 10:15:49 -0400 |
commit | 2ad51d78025a141d455e5bf8b3c2acee451156ad (patch) | |
tree | 155afa3960137418e3957b154afff27b3447a618 | |
parent | 321d428cfc66c1c627864de0eaf36ffbe15247c5 (diff) | |
download | git-bz-2ad51d78025a141d455e5bf8b3c2acee451156ad.tar.gz |
Pass --ignore-submodules when checking uncommitted changes
When we check for uncommitted changes prior to adding URLs to
to commit messages we should ignore submodules, since they don't
affect the rebase xprocess we use to add URLs.
Reported by Benjamin Otte
https://bugzilla.gnome.org/show_bug.cgi?id=611693
-rwxr-xr-x | git-bz | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1155,8 +1155,8 @@ def check_add_url(commits, bug_id=None, is_add_url=False): return try: - git.diff(exit_code=True, _quiet=True) - git.diff(exit_code=True, cached=True, _quiet=True) + git.diff(exit_code=True, ignore_submodules=True, _quiet=True) + git.diff(exit_code=True, ignore_submodules=True, cached=True, _quiet=True) except CalledProcessError: die("Cannot add bug reference to commit message(s); You must commit (or stash) all changes first") |