search

cosmin / git-hg

A git-hg utility for checking out and tracking a mercurial repo.
http://offbytwo.github.com/git-hg
MIT License
307 stars 51 forks source link

pull fails with "cut: illegal option -- -" #9

Closed lhanson closed 13 years ago

lhanson commented 13 years ago

I've got a branch called 'upstream' which I'm using to track the upstream hg repo. Whenever it actually has changes to it, my 'git-hg pull' fails thusly:

[...]
remote: Counting objects: 8, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 6 (delta 4), reused 4 (delta 2)
Unpacking objects: 100% (6/6), done.
From .git/hgremote
   4846d9d..e492cc0  master     -> hg/master
cut: illegal option -- -
usage: cut -b list [-n] [file ...]
       cut -c list [file ...]
       cut -f list [-s] [-d delim] [file ...]
fatal: 'hg/' does not point to a commit

At this point I see the new commits on 'remotes/hg/master' ahead of my current 'upstream' head, but it appears that the merge failed.

offbyone commented 13 years ago

I'm seeing this too, at the end of pull (Note that I'm running OSX):

± git hg pull

remote: Warning: No xauth data; using fake authentication data for X11 forwarding.
pulling from ssh://hg@hg.advanis.ca/advanis/9163_saas/webservices
searching for changes
no changes found
Using last hg repository "../hgcheckout"
Exporting tag [1.0] at [hg r667] [git 2401b2a5b1839829d9fb1ab52e61f8e099be8875]
...
Exporting tag [1.13.17] at [hg r1169] [git 3ac2baae9395e074809e727c9e4a240dd331852d]
Issued 108 commands
git-fast-import statistics:
---------------------------------------------------------------------
Alloc'd objects:       5000
Total objects:            0 (         0 duplicates                  )
      blobs  :            0 (         0 duplicates          0 deltas)
      trees  :            0 (         0 duplicates          0 deltas)
      commits:            0 (         0 duplicates          0 deltas)
      tags   :            0 (         0 duplicates          0 deltas)
Total branches:         108 (         0 loads     )
      marks:           1024 (         0 unique    )
      atoms:              0
Memory total:          2282 KiB
       pools:          2048 KiB
     objects:           234 KiB
---------------------------------------------------------------------
pack_report: getpagesize()            =       4096
pack_report: core.packedGitWindowSize = 1073741824
pack_report: core.packedGitLimit      = 8589934592
pack_report: pack_used_ctr            =        324
pack_report: pack_mmap_calls          =          1
pack_report: pack_open_windows        =          1 /          1
pack_report: pack_mapped              =    4163428 /    4163428
---------------------------------------------------------------------

cut: illegal option -- -
usage: cut -b list [-n] [file ...]
       cut -c list [file ...]
       cut -f list [-s] [-d delim] [file ...]
fatal: 'hg/' does not point to a commit
lhanson commented 13 years ago

I'm also on OSX, so maybe there's a correlation there.

lhanson commented 13 years ago

This is due to the GNU and BSD versions of cut taking different options for selecting a range of characters. I've circumvented this by using sed to select the current branch instead (try it here).

lhanson commented 13 years ago

Oops, sorry. The "Comment and Close" button is too easy to hit absentmindedly, I didn't mean to close the issue. I hate that button.

cosmin commented 13 years ago

hopefully switching to sed fixed this for everyone. I accidentally picked up cut from a previous pull request. It used to use awk previously and work on both Linux on OS X.