)]}'
{
  "commit": "7c5776eb66b5ab36a586d9a87dd12ee7c0b0cf44",
  "tree": "83b7709c01f829236d9151fc576d04f4ebe5b46f",
  "parents": [
    "37a6dd7aadf3380ddbe6418d5667e9dce42eff18"
  ],
  "author": {
    "name": "Zane Bitter",
    "email": "zbitter@redhat.com",
    "time": "Wed Jul 17 15:57:10 2013 +0200"
  },
  "committer": {
    "name": "Peter P Waskiewicz Jr",
    "email": "peter.p.waskiewicz.jr@intel.com",
    "time": "Wed Jul 17 14:30:59 2013 -0700"
  },
  "message": "Fix dirty index errors when resolving conflicts\n\nThe patch 6e8fdc58c786a45d7a63c5edf9c702f1874a7a19 causes StGit to raise\n\"warnings\" (actually: errors) in the event that there are changes staged in\nthe index and a refresh is performed without specifying either --index or\n--force. This is great for preventing an entire class of common mistakes,\nbut is also a giant pain when resolving conflicts after a pull/rebase.\nDepending on the workflow in use, this may occur with a frequency anywhere\nbetween \"never\" and \"mulitple times on every pull\".\n\nThis patch removes the pain by:\n - Reporting unresolved conflicts *before* complaining about staged\n   changes, since it goes without saying that, when present, these are the\n   main problem.\n - Not complaining about staged changes if there are no unstaged changes in\n   the working directory, since the presence of --index is immaterial in\n   this case.\n\nSigned-off-by: Zane Bitter \u003czbitter@redhat.com\u003e\nSigned-off-by: Peter P Waskiewicz Jr \u003cpeter.p.waskiewicz.jr@intel.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "a2bab42e00c0efac69afb74ae6f7ba90cab38667",
      "old_mode": 33188,
      "old_path": "stgit/commands/refresh.py",
      "new_id": "331c18dda1c583ccc805455f9554e912b4b42392",
      "new_mode": 33188,
      "new_path": "stgit/commands/refresh.py"
    }
  ]
}