git客户端之间的git状态差异

时间:2015-10-21 12:49:28

标签: git cocoapods atlassian-sourcetree github-for-mac github-desktop

在过去的几年里,我使用SourceTree作为git客户端。昨天我尝试了Github Desktop的最新版本(版本Infinite Lop(214))。它比我之前尝试过的所有其他版本都要好。仍然不比SourceTree好,但无论如何我喜欢它:)我决定使用而不是SourceTree一段时间。

但今天我打开另一个项目,我对一些文件状态感到惊讶。它表明有超过90个未提交的更改:

enter image description here

但事实上我只改变了一些文件。它是如何发生的。为了确保这一点,我在终端上检查了相同的项目:

=> git status

但令人惊讶的是,它在OSX的git版本上也显示了相同的结果:

On branch SomeBranchNameOfProject
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   Podfile
    typechange: Pods/Headers/Public/AFNetworking/AFHTTPRequestOperation.h
    typechange: Pods/Headers/Public/AFNetworking/AFHTTPRequestOperationManager.h
    typechange: Pods/Headers/Public/AFNetworking/AFHTTPSessionManager.h
    typechange: Pods/Headers/Public/AFNetworking/AFNetworkActivityIndicatorManager.h
    typechange: Pods/Headers/Public/AFNetworking/AFNetworkReachabilityManager.h
    typechange: Pods/Headers/Public/AFNetworking/AFNetworking.h
    typechange: Pods/Headers/Public/AFNetworking/AFSecurityPolicy.h
    typechange: Pods/Headers/Public/AFNetworking/AFURLConnectionOperation.h
    typechange: Pods/Headers/Public/AFNetworking/AFURLRequestSerialization.h
    typechange: Pods/Headers/Public/AFNetworking/AFURLResponseSerialization.h
    typechange: Pods/Headers/Public/AFNetworking/AFURLSessionManager.h
    typechange: Pods/Headers/Public/AFNetworking/UIActivityIndicatorView+AFNetworking.h
    typechange: Pods/Headers/Public/AFNetworking/UIAlertView+AFNetworking.h
    typechange: Pods/Headers/Public/AFNetworking/UIButton+AFNetworking.h
    typechange: Pods/Headers/Public/AFNetworking/UIImageView+AFNetworking.h
    typechange: Pods/Headers/Public/AFNetworking/UIKit+AFNetworking.h
    typechange: Pods/Headers/Public/AFNetworking/UIProgressView+AFNetworking.h
    typechange: Pods/Headers/Public/AFNetworking/UIRefreshControl+AFNetworking.h
    typechange: Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h
    typechange: Pods/Headers/Public/BPXLUUIDHandler/BPXLUUIDHandler.h
    typechange: Pods/Headers/Public/CocoaLumberjack/CocoaLumberjack.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDASLLogCapture.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDASLLogger.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDAbstractDatabaseLogger.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDAssertMacros.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDContextFilterLogFormatter.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDDispatchQueueLogFormatter.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDFileLogger.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDLegacyMacros.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDLog+LOGV.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDLog.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDLogMacros.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDMultiFormatter.h
    typechange: Pods/Headers/Public/CocoaLumberjack/DDTTYLogger.h
    typechange: Pods/Headers/Public/MBProgressHUD/MBProgressHUD.h
    typechange: Pods/Headers/Public/MMDrawerController/MMDrawerBarButtonItem.h
    typechange: Pods/Headers/Public/MMDrawerController/MMDrawerController+Subclass.h
    typechange: Pods/Headers/Public/MMDrawerController/MMDrawerController.h
    typechange: Pods/Headers/Public/MMDrawerController/MMDrawerVisualState.h
    typechange: Pods/Headers/Public/MMDrawerController/UIViewController+MMDrawerController.h
    typechange: Pods/Headers/Public/Mantle/MTLJSONAdapter.h
    typechange: Pods/Headers/Public/Mantle/MTLModel+NSCoding.h
    typechange: Pods/Headers/Public/Mantle/MTLModel.h
    typechange: Pods/Headers/Public/Mantle/MTLReflection.h
    typechange: Pods/Headers/Public/Mantle/MTLTransformerErrorHandling.h
    typechange: Pods/Headers/Public/Mantle/MTLValueTransformer.h
    typechange: Pods/Headers/Public/Mantle/Mantle.h
    typechange: Pods/Headers/Public/Mantle/NSArray+MTLManipulationAdditions.h
    typechange: Pods/Headers/Public/Mantle/NSDictionary+MTLJSONKeyPath.h
    typechange: Pods/Headers/Public/Mantle/NSDictionary+MTLManipulationAdditions.h
    typechange: Pods/Headers/Public/Mantle/NSDictionary+MTLMappingAdditions.h
    typechange: Pods/Headers/Public/Mantle/NSError+MTLModelException.h
    typechange: Pods/Headers/Public/Mantle/NSObject+MTLComparisonAdditions.h
    typechange: Pods/Headers/Public/Mantle/NSValueTransformer+MTLInversionAdditions.h
    typechange: Pods/Headers/Public/Mantle/NSValueTransformer+MTLPredefinedTransformerAdditions.h
    typechange: Pods/Headers/Public/Reachability/Reachability.h
    typechange: Pods/Headers/Public/SDWebImage/NSData+ImageContentType.h
    typechange: Pods/Headers/Public/SDWebImage/SDImageCache.h
    typechange: Pods/Headers/Public/SDWebImage/SDWebImageCompat.h
    typechange: Pods/Headers/Public/SDWebImage/SDWebImageDecoder.h
    typechange: Pods/Headers/Public/SDWebImage/SDWebImageDownloader.h
    typechange: Pods/Headers/Public/SDWebImage/SDWebImageDownloaderOperation.h
    typechange: Pods/Headers/Public/SDWebImage/SDWebImageManager.h
    typechange: Pods/Headers/Public/SDWebImage/SDWebImageOperation.h
    typechange: Pods/Headers/Public/SDWebImage/SDWebImagePrefetcher.h
    typechange: Pods/Headers/Public/SDWebImage/UIButton+WebCache.h
    typechange: Pods/Headers/Public/SDWebImage/UIImage+GIF.h
    typechange: Pods/Headers/Public/SDWebImage/UIImage+MultiFormat.h
    typechange: Pods/Headers/Public/SDWebImage/UIImageView+HighlightedWebCache.h
    typechange: Pods/Headers/Public/SDWebImage/UIImageView+WebCache.h
    typechange: Pods/Headers/Public/SDWebImage/UIView+WebCacheOperation.h

实际上SourceTree没有显示带有“未提交更改的更改”警告的文件!

我知道源代码树使用自己的嵌入式Git,我可以在首选项中更改它:

enter image description here

这意味着,SourceTree可能会显示相同的“非暂存文件”......

我的问题是,我如何使用Github桌面具有相同的体验,比如我如何使用SourceTree?我的CocoaPods文件出了什么问题。或者,如果我理解错误,请指导我解决此问题。

1 个答案:

答案 0 :(得分:0)

在询问我的问题后,我将OSX更新为version 10.11.1 (15B42),将XCode更新为Version 7.1 (7B91b)。但事情变得更糟XCode开始为工作区中的所有文件显示问号(表示:文件未被源代码管理跟踪)。那一刻我在工作区中发现了 .git目录的错误。我打开终端并进入.git目录。我从备份目录中查看我项目的旧副本(如果你有备份,那么你很幸运......)。它与以前不同。我知道SourceTree在我的.git目录中添加了sourcetreeconfig目录,而且还有更多。我知道 Github桌面添加了目录,每个人(所有客户端)都互相影响,除了可爱甜美的SourceTree!我想对团队和Atlassian说声谢谢。

解决方案:我删除了从Github Desktop创建的其他目录,现在一切都像魅力一样。

所以我的Github桌面广告暂停了。但几天后我会再试一次,但这次只能和Github桌面一起工作。为什么?因为我喜欢它:)。

感谢您的评论@torek。