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,628 other followers

Archive for the ‘Source Code Management’ Category

When “git mv” on a directory gives you en error starting with “fatal: bad source”

Posted by jpluimers on 2016/08/23

I use “git mv” a lot because somehow it works a lot better than having git automagically find out about renames.

The problem with “git mv” is that the “fatal: bad source” errors are a catch-all for many causes. Just look at the

Searching for “git mv” directory “fatal: bad source” didn’t get me much further. The one link that did get me towards the right track is version control – Getting Git to follow renamed and edited files – Stack Overflow.

What happened was that I had manually deleted and edited some files as part of a mass script (the repository had a lot of files in it that didn’t belong there compile targets and user specific settings or didn’t adhere to the naming conventions) before executing the “git mv”.

Since “git mv” tries to administer all the files that it thinks originally were in the directory, it complains about those files.

Lesson learned: first “git mv” then perform other changes.

–jeroen

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

on code quality: Can we automate everything? | CommitStrip – Blog relating the daily life of web agencies developers

Posted by jpluimers on 2016/08/03

Repeated because it is the most important aspect of software development.

automating everything

automating everything

–jeroen

via: Can we automate everything? | CommitStrip – Blog relating the daily life of web agencies developers.

Posted in Agile, Code Quality, Development, Software Development, Source Code Management | Leave a Comment »

Push a new local branch to a remote Git repository and track it too – Stack Overflow

Posted by jpluimers on 2016/07/27

Just what I needed: Push a new local branch to a remote Git repository and track it too – Stack Overflow But watch the comments to this answer:

Answer:

In recent versions of Git (1.7.0 and later), you can checkout a new branch:

git checkout -b <branch>

Edit files, add and commit. Then push with the -u option:

git push -u origin <branch>

Git will set up the tracking information during the push.

Daniel Ruoso / Dan

Comments:

  • git push -u was introduced in Git 1.7.0 (2010-02-12). – Chris Johnsen Jun 4 ’11 at 4:16
  • Would you be kind enough to elaborate? Some git commands do more than one thing, and I’m not sure what origin and mynewfeature refer to. Is mynewfeature a branch name? Is origin a shortcut for a full remote repo url? Also what does the -u flag do? – Costa Mar 6 ’14 at 21:16
  • @Costa ‘origin’ is the name of default remote in Git repository. ‘mynewfeature’ here is branch name. -uis short for --set-upstream—for what it does and why it’s needed I wouldn’t mind some explanation, too. :) – Anton Strogonoff Mar 9 ’14 at 6:07
  • It’s also worth noting that if you have an existing tracking branch already set on the branch you’re pushing, and push.default is set to upstream, this will not do what you think it will do. It will try to push over the existing tracking branch. Use: git push -u origin mynewfeature:mynewfeature or dogit branch --unset-upstream first. – void.pointer May 19 ’14 at 18:07
  • I still needed to ‘git branch –set-upstream-to origin/remote’ in order for ‘git status’ to correctly report my branch status with respect to the remote branch. – Paul Whipp Jul 4 ’14 at 1:17
  • For people using Git from Visual Studio: Actually this is that “Publish Branch” in Visual Studio does. After executing git push with -u parameter i can finally see my branch as published in VS UI. – Puterdo Borato

 

–jeroen

Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management, Visual Studio 2013, Visual Studio 2014, Visual Studio 2015, Visual Studio and tools | Leave a Comment »

the curse of tooling replacing double quotation marks with left double quotation marks and right double quotation marks – via StackOverflow

Posted by jpluimers on 2016/07/21

Most developers I speak to have trapped into a case of copy/pasting some source code containing quotation marks from documentation or post immediately failing on curly quotes like left double quotation marks () and right double quotation marks () that should have been regular double quotation marks (").

I’ve tried to search for a way to automate the replacement process to “ASCII quotation marks”, but not found an on-line engine yet. The best I could find was this post: java – Replacing unicode punctuation with ASCII approximations – Stack Overflow.

Note it’s not only the auto-correct of office applications. For instance “blog engines” like WordPress do that too, unless you add a code or pre around them:

  • code: "blog engines"
  • pre:
    "blog engines"

Very irritating, but apparently nowadays beauty trumps accuracy.

–jeroen

via: xampp – Apache Prefixing Path to Virtual Hosts Path – Stack Overflow.

Posted in Development, Software Development, Source Code Management | Leave a Comment »

Git Cheat Sheet

Posted by jpluimers on 2016/07/14

I had seen the bitmap Git Cheat Sheet referenced numerous times, so I went searching for the source and found it under Creative Commons 3.0 license at http://byte.kde.org/~zrusin/git/ which has the Vector Image Source by Zack Rusin.

[ICO] Name Last modified Size Description

[DIR] Parent Directory
[IMG] git-cheat-sheet-large.png 29-Aug-2007 14:52 1.2M
[IMG] git-cheat-sheet-medium.png 29-Aug-2007 14:52 336K
[IMG] git-cheat-sheet.svg 29-Aug-2007 14:52 162K
[IMG] git-cheet-sheet-small.png 10-Sep-2007 09:05 87K
[TXT] license.html 29-Aug-2007 08:41 24K

And yes, they are all in the Wayback Machine: http://web.archive.org/web/*/http://byte.kde.org/~zrusin/git/

–jeroen

via: Zack Rusin: Git cheat sheet.

Git Cheat Sheet Git Cheat Sheet

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

 
Follow

Get every new post delivered to your Inbox.

Join 1,628 other followers

%d bloggers like this: