The Wiert Corner – irregular stream of stuff

Jeroen W. Pluimers on .NET, C#, Delphi, databases, and personal interests

  • My work

  • My badges

  • Twitter Updates

  • My Flickr Stream

    20140508-Delphi-2007--Project-Options--Cannot-Edit-Application-Title-HelpFile-Icon-Theming

    20140430-Fiddler-Filter-Actions-Button-Run-Filterset-now

    20140424-Windows-7-free-disk-space

    More Photos
  • Pages

  • All categories

  • Enter your email address to subscribe to this blog and receive notifications of new posts by email.

    Join 1,689 other followers

Archive for the ‘Source Code Management’ Category

Visual Studio: In TFS how can I correct the links to work items on an existing changeset – Stack Overflow

Posted by jpluimers on 2017/01/17

This is still one of my gripes from Visual Studio: when a changeset is linked to an incorrect work item, you still have to change this from the work item side:

You cannot change it from the changeset UI, but you can change it from most work item UI’s. You can just add a link to a the specific changeset and the changeset will show the link as well.

You have to be careful with the steps too:

  1. Link it from the correct work item as a changeset link
  2. Unlink it from the wrong work item

If you do it in reverse order, and get the changeset number wrong, you will have an orphan changeset.

–jeroen

Source: visual studio 2010 – In TFS how can I correct the links to work items on an existing changeset – Stack Overflow

Posted in Development, Software Development, Source Code Management, TFS (Team Foundation System), Visual Studio 2010, Visual Studio 2012, Visual Studio 2013, Visual Studio 2015, Visual Studio and tools | Leave a Comment »

Great tutorial on how to split older Git commits: http://bit.ly/1rE72cI -…

Posted by jpluimers on 2017/01/02

A long time ago (2014!), [WayBack] Great tutorial on how to split older Git commits: http://bit.ly/1rE72cI – should be used with care, but this can be a lifesaver and a really useful trick… – Ilya Grigorik – Google+ pointed me the below tutorial.

It has been in my drafts since then, but recently I found it back when I needed to rebase unpushed commits. Indeed it’s a great tutorial!

Executing the git rebase --interactive concepts can be tricky as they are on a way higher level than regular git work. So sometimes you want to exit vim notifying git to stop the current action. The easiest way I found was this vim command I found at [WayBackHow to abort a git rebase in interactive editor (thanks [WayBack] Telmo Costa!):

:cx

Via the tutorial, I also bumped into a few advanced git add features:

Another very powerfull feature is git add -p a.k.a. git add --patch which allows you to stage parts (or hunks) of a file.

[WayBackgit add -p: The most powerful git feature you’re not using yet

You can go even further with git add --interactive as this blog post shows:

[WayBackgit add –patch and –interactive

Back to the tutorial:

[WayBackGoing back in time to split older commits by thoughtram

Rebasing in Git allows you to go back in time to split older commits. In this article we’ll explore how to do exactly that!

git rebase --interactive

git rebase –interactive

Before the tutorial explains how to amend git commits, it covers these git rebase --interactive commands:

  • pick
  • reword
  • edit
  • squash
  • fixup

Note that squash will combine the commit on that line with the commit on the line above it.

There is one more little trick: to limit the number of commits (that’s normally limited to the unpushed ones), add like HEAD~4 which limits it to 4 commits.

Finally you can even use this for cherry picking, which I need to put on my research list: [WayBackgit: obtain the benefits of git rebase --interactive for cherry picks – Stack Overflow

Further reading:

–jeroen

Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »

The curse of vulnerable OpenSSL DLLs

Posted by jpluimers on 2016/12/30

When you ship OpenSSL DLLs, you should provide an update mechanism outside of your regular product cycle that updates these shortly after vulnerabilities are fixed.

Few if any products do that. So I made an overview from products and OpenSSL DLL versions I had installed on various systems.

I’m a developer, so the list is biased towards tools I use often.

All of them are vulnerable: [WayBackhttps://www.openssl.org/news/vulnerabilities.html

  • 1.0.2.h by ContinuaCI 1.8.1.185 PostgreSQL and Avast 12.3
  • 1.0.2.g by SourceTree 1.9.x embedded git_local
  • 1.0.2d by Git for Windows 2.6.1
  • 1.0.2a by SQLite browser 3.7.0
  • 1.0.1m by Delphi 10.0 Seattle
  • 1.0.1l by Ruby 2.3
  • 1.0.1f by SlikSvn 1.8.5
  • 1.0.1g by Delphi XE8, Delphi XE7, VMware Workstation OVF tool and Adobe Creative Cloud 2.8.1
  • 1.0.0g by Delphi XE6, Delphi XE5, Delphi XE4, Delphi XE3, Appmethod 1.13 and CollabNet SVN Client 1.7.5
  • 1.00d by MarkdownPad 2
  • 1.0.0 by FinalBuider 7 XE2 and FinalBuilder 7 EE
  • 0.9.8za by VMware Remote Console Plug-in 5.1 and VMware Virtual Infrastructure Client 5.1
  • 0.9.8y by VMware VIX Workstation 10
  • 0.9.8t by Veaam Backup and Replication
  • 0.9.8r by ContinuaCI 1.8.1.185 hg support, VMware VIX and VMware Workstation 8.0.2
  • 0.9.8q by Veeam Backup Transport, Veaam Backup, xampp 1.7.4 and Replication and VMware Virtual Infrastructure Client 5.0
  • 0.9.8o by xampp 1.7.4
  • 0.9.8l by xampp 1.7.4
  • 0.9.8n by Delphi XE2, Delphi XE and VMware VIX Workstation 7.1.0
  • 0.9.8m by VMware VMRC Plug-in, VMware VIX and VMware Workstation 8.0.2
  • 0.9.8i by VMware Virtual Infrastructure Client 4.1
  • 0.9.8d by Database Workbench Pro 4.4.3, Database Workbench Pro 5.2.4 and VMware vSphere CLI Perl
  • 0.9.8b by Adobe Creative Suite 5
  • 0.9.7m by VMware VIX server 1.0.9
  • 0.9.7l by VMware VIX VIServer 2
  • N/A by Adobe Create Suite 5 and VMware VIX server 1

–jeroen

via: [WayBackDoes Delphi installer install OpenSSL dll’s?

Posted in Delphi, .NET, Software Development, Development, Source Code Management, Power User, Subversion/SVN, Security, DVCS - Distributed Version Control, git, OpenSSL, Ruby, SourceTree, CollabNet | 7 Comments »

Remove from a Git repository without deleting it from the local filesystem – via: Stack Overflow

Posted by jpluimers on 2016/12/29

For a file:

git rm --cached mylogfile.log

For a directory:

git rm --cached -r mydirectory

Thanks bdonlan for answering that: Remove a file from a Git repository without deleting it from the local filesystem – Stack Overflow

–jeroen

Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »

How to I show the changes which have been (non)staged or are about to be commited? – via: Stack Overflow

Posted by jpluimers on 2016/12/27

I love this StackOverflow answer by Abizern (who maintained a great 365git blog as well):

A simple graphic makes this clearer

git diff

Shows the changes between the working directory and the index. This shows what has been changed, but is not staged for a commit.

git diff --cached

Shows the changes between the index and the HEAD(which is the last commit on this branch). This shows what has been added to the index and staged for a commit.

git diff HEAD

Shows all the changes between the working directory and HEAD (which includes changes in the index). This shows all the changes since the last commit, whether or not they have been staged for commit or not.

–jeroen

Source: git – How do I show the changes which have been staged? – Stack Overflow

Posted in Development, DVCS - Distributed Version Control, git, Source Code Management | Leave a Comment »

 
%d bloggers like this: