-
Notifications
You must be signed in to change notification settings - Fork 179
Open
Description
the status for Diff.Delta
bind to a wrong type,
SwiftGit2/SwiftGit2/Diffs.swift
Line 43 in c8a192f
self.status = Status(rawValue: UInt32(git_diff_status_char(delta.status))) |
delta.status
should be git_delta_t
but Status.type
is refer to git_status_t
in libgit2
SwiftGit2/SwiftGit2/Diffs.swift
Lines 65 to 87 in c8a192f
public struct Status: OptionSet { | |
// This appears to be necessary due to bug in Swift | |
// https://bugs.swift.org/browse/SR-3003 | |
public init(rawValue: UInt32) { | |
self.rawValue = rawValue | |
} | |
public let rawValue: UInt32 | |
public static let current = Status(rawValue: GIT_STATUS_CURRENT.rawValue) | |
public static let indexNew = Status(rawValue: GIT_STATUS_INDEX_NEW.rawValue) | |
public static let indexModified = Status(rawValue: GIT_STATUS_INDEX_MODIFIED.rawValue) | |
public static let indexDeleted = Status(rawValue: GIT_STATUS_INDEX_DELETED.rawValue) | |
public static let indexRenamed = Status(rawValue: GIT_STATUS_INDEX_RENAMED.rawValue) | |
public static let indexTypeChange = Status(rawValue: GIT_STATUS_INDEX_TYPECHANGE.rawValue) | |
public static let workTreeNew = Status(rawValue: GIT_STATUS_WT_NEW.rawValue) | |
public static let workTreeModified = Status(rawValue: GIT_STATUS_WT_MODIFIED.rawValue) | |
public static let workTreeDeleted = Status(rawValue: GIT_STATUS_WT_DELETED.rawValue) | |
public static let workTreeTypeChange = Status(rawValue: GIT_STATUS_WT_TYPECHANGE.rawValue) | |
public static let workTreeRenamed = Status(rawValue: GIT_STATUS_WT_RENAMED.rawValue) | |
public static let workTreeUnreadable = Status(rawValue: GIT_STATUS_WT_UNREADABLE.rawValue) | |
public static let ignored = Status(rawValue: GIT_STATUS_IGNORED.rawValue) | |
public static let conflicted = Status(rawValue: GIT_STATUS_CONFLICTED.rawValue) | |
} |
correct one should be
typedef enum {
GIT_DELTA_UNMODIFIED = 0, /**< no changes */
GIT_DELTA_ADDED = 1, /**< entry does not exist in old version */
GIT_DELTA_DELETED = 2, /**< entry does not exist in new version */
GIT_DELTA_MODIFIED = 3, /**< entry content changed between old and new */
GIT_DELTA_RENAMED = 4, /**< entry was renamed between old and new */
GIT_DELTA_COPIED = 5, /**< entry was copied from another old entry */
GIT_DELTA_IGNORED = 6, /**< entry is ignored item in workdir */
GIT_DELTA_UNTRACKED = 7, /**< entry is untracked item in workdir */
GIT_DELTA_TYPECHANGE = 8, /**< type of entry changed between old and new */
GIT_DELTA_UNREADABLE = 9, /**< entry is unreadable */
GIT_DELTA_CONFLICTED = 10, /**< entry in the index is conflicted */
} git_delta_t;
atom2ueki and marknotebummoblizard
Metadata
Metadata
Assignees
Labels
No labels