diff options
| author | Simon Hausmann <simon@lst.de> | 2008-01-07 14:21:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2008-02-03 19:19:16 +0100 |
| commit | 36ee4ee40e1851442b0b075870cd5de5df6ee2b6 (patch) | |
| tree | 606a2caee7b52598d160150d999bb3edcf90bfe5 /contrib | |
| parent | e96e400f67b8478a99f9d2b5d82f08cd21f51a88 (diff) | |
| download | git-36ee4ee40e1851442b0b075870cd5de5df6ee2b6.tar.gz git-36ee4ee40e1851442b0b075870cd5de5df6ee2b6.tar.xz | |
git-p4: Ensure the working directory and the index are clean before "git-p4 rebase"
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index a74aabdb2..e5fe5f6d3 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1611,6 +1611,11 @@ class P4Rebase(Command): return self.rebase() def rebase(self): + if os.system("git update-index --refresh") != 0: + die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up-to-date or stash away all your changes with git stash."); + if len(read_pipe("git diff-index HEAD --")) > 0: + die("You have uncommited changes. Please commit them before rebasing or stash them away with git stash."); + [upstream, settings] = findUpstreamBranchPoint() if len(upstream) == 0: die("Cannot find upstream branchpoint for rebase") |