{"shas":[["94fd016523a5b61479f83785c71d809a01c86856","a88b7dcd1a9e3e17770bbaa6d7515b31a2d7e85d@cs-ware.de","updates changelog\n\nSigned-off-by: Sven Strickroth <email@cs-ware.de>","Sven Strickroth"],["1dc7b7265abfd55057d130812ea8237ce921be19","a88b7dcd1a9e3e17770bbaa6d7515b31a2d7e85d@cs-ware.de","Fixed issue #737: Diffing of added files does not work with Shell\n\nSigned-off-by: Sven Strickroth <email@cs-ware.de>","Sven Strickroth"],["f6ff1506ad356f5658635286d132d3015bf2057d","a88b7dcd1a9e3e17770bbaa6d7515b31a2d7e85d@cs-ware.de","Fixed issue #738: Lost the commit id on file name when use a external diff tool\n\nSigned-off-by: Sven Strickroth <email@cs-ware.de>","Sven Strickroth"],["722180c97058d9ea528f5a79705dde7e6afc7ef9","a88b7dcd1a9e3e17770bbaa6d7515b31a2d7e85d@cs-ware.de","fix possible race conditions with temp-filename\n\nSigned-off-by: Sven Strickroth <email@cs-ware.de>","Sven Strickroth"],["684fca5f6e3ad46c0d160cccb8a3d84009515da6","a88b7dcd1a9e3e17770bbaa6d7515b31a2d7e85d@cs-ware.de","code cleanup\n\nSigned-off-by: Sven Strickroth <email@cs-ware.de>","Sven Strickroth"],["6ad58ccb0c22869846f5e77cfb1cce5629ea097d","1ffd8368c021aaa56a11304a5e0eb78a14978358@gmail.com","Fixed issue #714: add \"FETCH_HEAD\" to reference drop down list.\n\nGit cannot always parse FETCH_HEAD to a hash value correctly. As mentioned earlier, git uses the first hash found in de FETCH_HEAD file. This is OK when it contains just 1 hash, like when you did something like:\ngit fetch git://github.com/Jopie64/tortoisegit master\n\nBut when you do something like:\ngit fetch\n\nthe FETCH_HEAD file looks like:\n\n9a3de1f4895f9783f9ce213346dfa74c03345876\tnot-for-merge\tbranch 'graph' of git://repo.or.cz/TortoiseGit\nd6243bca70a6f8dfed786afa9ea236e54c4683a9\tnot-for-merge\tbranch 'log_perfomance' of git://repo.or.cz/TortoiseGit\n3c6e4d6094953bc8482588a6fceb8ab471d0eefc\tnot-for-merge\tbranch 'log_speed' of git://repo.or.cz/TortoiseGit\n2150d6faa5c0aa3ddaecfe0941643c5959b6734e\t\tbranch 'master' of git://repo.or.cz/TortoiseGit\n884a5bf5a93f5ff1fa3420f60b2e88cc16c789bd\tnot-for-merge\tbranch 'myagi_overlay_exe' of git://repo.or.cz/TortoiseGit\nc8d9a75a7bac5cbff2ff35a2c42331a3a4a1b5f9\tnot-for-merge\tbranch 'myapi_overlay' of git://repo.or.cz/TortoiseGit\n69c3400152b3040e74787f543bf0e51217a07d31\tnot-for-merge\tbranch 'update_overlay' of git://repo.or.cz/TortoiseGit\nf285dc3182c6f437c015db10e19a594a272effb8\tnot-for-merge\tbranch 'upgrade_plink' of git://repo.or.cz/TortoiseGit\n5d24e29ed857618be83072a73b868c78ada725d4\tnot-for-merge\ttag 'REL_1.6.3.0_EXTERNAL' of git://repo.or.cz/TortoiseGit\ndea133d17a39d0a21c325c76908e566a14b69c38\tnot-for-merge\ttag 'REL_1.6.4.0_INTERNAL' of git://repo.or.cz/TortoiseGit\n\nWhen you execute \"git merge FETCH_HEAD\" now, it merges ref 9a3de1f489... into the current branch because it uses \"git rev-parse FETCH_HEAD\" which picks the first hash found in the file. Instead it should pick the one without the \"not-for-merge\" tag. In this case: 2150d6faa...\nFixBranchName(\"FETCH_HEAD\") would return 2150d6faa... in this case.\n\nI did not find a git command to do this. The only one which actually parses FETCH_HEAD the right way is \"git pull\". This command does \"git fetch\" and then parses FETCH_HEAD to \"git merge\" the right hash(es) into the current HEAD.\n\nThere could be more lines without the \"not-for-merge\" tag. In this case, git pull would execute an octopus merge. FixBranchName() does not support this case and returns an empty HASH in this case. Also, the FETCH_HEAD ref will not appear in the combo in this case. I did not implement this because I think this git feature is not used often.","Johan 't Hart"]],"repo":"csware/TortoiseGit","actor":"csware","ref":"refs/heads/master","size":6,"head":"6ad58ccb0c22869846f5e77cfb1cce5629ea097d","actor_gravatar":"51738d8dc4c36c17c873c9424d526924","push_id":26480351}