| commit | a496410df9d9d2ff72c662d229329cae302a0edc | |
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Sat, 8 May 2010 21:12:19 +0000 (8 23:12 +0200) | ||
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Sat, 8 May 2010 21:12:19 +0000 (8 23:12 +0200) | ||
| tree | 351901c81a69222cec74fc81664f6d8892ff4bbe | treesnapshot (tar.gz zip) |
| parent | 23583e59bbd707d4f10e15af7c1c4f2874e13685 | commitdiff |
A stages field and getter for GitIndex entry introduced
Currently, if the Index contains a file in more than one stage, only
the last entry (containing the highest stage) will be registered in
GitIndex. For applications it can be useful to not only know about the
highest stage, but also which other stages are present, e.g. to detect
the type of conflict the file is in.
Change-Id: I2d4ff9f6023335d9ba6ea25d8e77c8e283ae53cb
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Currently, if the Index contains a file in more than one stage, only
the last entry (containing the highest stage) will be registered in
GitIndex. For applications it can be useful to not only know about the
highest stage, but also which other stages are present, e.g. to detect
the type of conflict the file is in.
Change-Id: I2d4ff9f6023335d9ba6ea25d8e77c8e283ae53cb
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
| org.eclipse.jgit/src/org/eclipse/jgit/lib/GitIndex.java | diffblobblamehistory |