tags:

views:

319

answers:

3

I know this isnt strictly a programming question but it is related to git. I accidentally have created a branch in git called "--track" (I got the order of options wrong when merging a remote branch)

The regular command doesn't work: git branch -D "--track"

I have tried to escape with quotes and backward slashes, however neither work.

Any ideas?

+17  A: 

Did you try

git branch -D -- --track

? the " -- " is usually the convention for "what follows is not an option, whatever its name"


From "The Art of Unix Programming", section "Command-Line Options":

It is also conventional to recognize a double hyphen as a signal to stop option interpretation and treat all following arguments literally.

You will find that convention in other (not necessary Unix-related) CLI (Command Line Interface) like cleartool:

If a nonoption argument begins with a hyphen () character, you may need to precede it with a double-hyphen argument, to prevent it from being interpreted as an option:

cleartool rmtype -lbtype -- -temporary_label-

The P18 (a fast and flexible file preprocessor with macro processing capabilities and special support for internationalization) mentions that also and gives a good description of the general idea behind that convention:

All option arguments passed to the commands start with a single hyphen.
All option arguments (if any) must preceed all non-option arguments.
The end of the option arguments may be signaled using a double hyphen, this is useful if a non-option argument starts with a hyphen. Terminating the list of option arguments with a double hyphen works for all commands, even those that don't take any option arguments.

The OptionParser tool written in ruby also also lays it out quite plainly:*

Option Parsing Termination

It is convention that a double hyphen is a signal to stop option interpretation and to read the remaining statements on the command line literally. So, a command such as:

 app -- -x -y -z

will not ‘see’ the three mode-flags. Instead, they will be treated as arguments to the application:

 #args = ["-x", "-y", "-z"]


Note: sometime, it takes three dashes and not two, especially when the CLI follows strictly the Gnu options styles:

The Gnu style command line options provide support for option words (or keywords), yet still maintain compatibility with the Unix style options.
The options in this style are sometimes referred to as long_options and the Unix style options as short_options.
The compatibility is maintained by preceding the long_options with two dashes

Similar to the Unix style double-hyphen ’--’, the Gnu style has a triple-hyphen ’---’ to signal that option parsing be halted and to treat the remaining text as arguments (that is, read literally from the command line)

So... if ' -- ' is not enough (it should be with Git commands), try ' --- '

VonC
Is -- a convention for git only or for most linux command line tools?
ZelluX
@Zelux: good question. I was just checking that. Not confirmed for now.
VonC
Perhaps not all, but certainly for such basics as rm. It's one way you get rid of a file called "-rf"....
quark
Ok, found examples and references: answer updated
VonC
@VonC: Thanks for sharing
ZelluX
@quark, another way to get rid of “-rf” would be “rm ./-rf”. :)
Bombe
With msysgit, this doesn't work from Powershell, but does work from a cmd window.
Thomas G. Mayfield
+3  A: 
git branch -D -- --track
Fake Code Monkey Rashid
A: 

I'm using msysgit 1.7.0.2 and the suggested solution doesn't work:

git branch -D -- --track # doesn't work

No error is reported, but the branch still remains. I ended up forcibly removing the branch via:

rm .git/refs/heads/--track

James Kovacs