#147 ✓ hold
JiHO

Wrong status over samba

Reported by JiHO | May 7th, 2009 @ 05:11 PM

When the repository that is browsed in on a samba share, Gitx shows some files as changed when there are actually no more changes in these files:

http://dl.getdropbox.com/u/10473...

It does not seem to be a problem of changed files permissions (samba puts a mask on those so it could have been) since the permissions output by ls -l are the same locally and remotely.

In addition, committing the whole file (by double clicking it in the "Unstaged changes" area) commits it but the file immediately reappears in the "Unstaged changes" (with an empty diff of course)

Comments and changes to this ticket

  • Pieter de Bie

    Pieter de Bie May 28th, 2009 @ 04:51 PM

    That's funny.. can you compare the output of

    git update-index -q --unmerged --ignore-missing --refresh
    git --git-dir=/Users/pieter/projects/GitX/.git ls-files --others --exclude-standard -z
    git --git-dir=/Users/pieter/projects/GitX/.git diff-files -z
    

    in both directories and see if there's a difference? My guess would be OS X doesn't like the samba stuff, perhaps of the 2-second timestamps.

  • JiHO

    JiHO May 29th, 2009 @ 04:55 PM

    I supposed that the --git-dir argument was something local to your machine. here is the output from within my repository:

    On the server

    acanthurus:~/discus
    $ git update-index -q --unmerged --ignore-missing --refresh
    
    acanthurus:~/discus
    $ git ls-files --others --exclude-standard -z
    discus.tmprojggplot_dens_and_points.Rij.shinvert_Y.Rjava_options.txtplot_gps.Rplots.pdfrange_circular_fix.Rscratchpad.Rscratchpad.sh
    acanthurus:~/discus
    $ git diff-files -z
    :100644 100644 7387d20924d2d956de25c6e9bf64f30e02aa9d35 0000000000000000000000000000000000000000 Mbb.conf:100644 100644 ec878543abb1f97a9236707b36b367e318e3393b 0000000000000000000000000000000000000000 Mreorg_data.R:100644 100644 4340bf03097dbb7c3da5519ba809915515c4b155 0000000000000000000000000000000000000000 Msrc/correct_tracks.R:100644 100644 c2ed8503d24cd97ce026c865a81094da4fca9ba9 0000000000000000000000000000000000000000 Msrc/stats.R
    

    On my machine, in the same repository mounted via samba (i.e. where gitx is having trouble):

    /Volumes/jiho/discus
    $ git update-index -q --unmerged --ignore-missing --refresh
    
    /Volumes/jiho/discus
    $ git ls-files --others --exclude-standard -z
    discus.tmprojggplot_dens_and_points.Rij.shinvert_Y.Rjava_options.txtplot_gps.Rplots.pdfrange_circular_fix.Rscratchpad.Rscratchpad.sh
    /Volumes/jiho/discus
    $ git diff-files -z
    :100644 100644 3c92e1bf126ac860c901056b95a12ca5ec3c9fab 0000000000000000000000000000000000000000 M.gitignore:100644 100644 e589c53c8bc1236f2c26fb919b7cbde58eeba5a4 0000000000000000000000000000000000000000 MREADME.md:100755 100755 b2627bde1a657c64002f12f46bd875ba1510d31f 0000000000000000000000000000000000000000 Mapply-to-all.sh:100755 100755 872559f9a0ab6c0d6652e28f76bc327d8710d378 0000000000000000000000000000000000000000 Mbb:100644 100644 7387d20924d2d956de25c6e9bf64f30e02aa9d35 0000000000000000000000000000000000000000 Mbb.conf:100755 100755 549031662747a3e72b3bab1f632c254249cb9ed1 0000000000000000000000000000000000000000 Mdata_stats.sh:100644 100644 f9ce73e94f14285292a84b4fabeb0419afbbc522 0000000000000000000000000000000000000000 Mglobal_stats.R:100644 100644 ec878543abb1f97a9236707b36b367e318e3393b 0000000000000000000000000000000000000000 Mreorg_data.R:100644 100644 94a9ed024d3859793618152ea559a168bbcbb5e2 0000000000000000000000000000000000000000 Msrc/GNU_GPL.txt:100644 100644 4340bf03097dbb7c3da5519ba809915515c4b155 0000000000000000000000000000000000000000 Msrc/correct_tracks.R:100644 100644 d62437858ec20a4e2ea205cba03d0d0d4a12d97c 0000000000000000000000000000000000000000 Msrc/ij.macro.open_process_stack.txt:100644 100644 ea87b2ed9f28789ad11dfb8d3a101f7824e4498e 0000000000000000000000000000000000000000 Msrc/imagej/plugins/Manual_Tracking.java:100644 100644 9f9f3c08fc1a2c86b4e52ed0d3b9f3650e27e0e9 0000000000000000000000000000000000000000 Msrc/lib_circular_stats.R:100644 100644 5b54e19e1d271cbe18886fe1979e2f87a4eed926 0000000000000000000000000000000000000000 Msrc/lib_discus.sh:100644 100644 2c0b85db44a1f90e1c00c828cce94f3de67348a7 0000000000000000000000000000000000000000 Msrc/lib_image_time.R:100644 100644 d2fe114ea8044716b73d103d9fffda18a7417c4e 0000000000000000000000000000000000000000 Msrc/lib_shell.sh:100644 100644 c2ed8503d24cd97ce026c865a81094da4fca9ba9 0000000000000000000000000000000000000000 Msrc/stats.R:100644 100644 776694862aec61259f9445d8e4f2bcfe176728a8 0000000000000000000000000000000000000000 Msrc/test_circular.R:100755 100755 28c9181bbdfd6aa0651242d66db386eef4b7cf40 0000000000000000000000000000000000000000 Msync_data.sh
    /Volumes/jiho/discus
    $
    

    Thanks in advance for your help.

  • JiHO

    JiHO May 29th, 2009 @ 04:58 PM

    Oops, I should have wrapped the text. Here is wrapped version:

    On the server

    acanthurus:~/discus $ git update-index -q --unmerged
    --ignore-missing --refresh
    
    acanthurus:~/discus $ git ls-files --others --exclude-standard
    -z
    discus.tmprojggplot_dens_and_points.Rij.shinvert_Y.Rjava_options.
    txtplot_gps.Rplots.pdfrange_circular_fix.Rscratchpad.Rscratchpad.sh
    acanthurus:~/discus $ git diff-files -z :100644 100644
    7387d20924d2d956de25c6e9bf64f30e02aa9d35
    0000000000000000000000000000000000000000 Mbb.conf:100644
    100644 ec878543abb1f97a9236707b36b367e318e3393b
    0000000000000000000000000000000000000000 Mreorg_data.R:100644
    100644 4340bf03097dbb7c3da5519ba809915515c4b155
    0000000000000000000000000000000000000000
    Msrc/correct_tracks.R:100644 100644
    c2ed8503d24cd97ce026c865a81094da4fca9ba9
    0000000000000000000000000000000000000000 Msrc/stats.R
    

    On my machine, in the same repository mounted via samba (i.e. where gitx is having trouble):

    /Volumes/jiho/discus $ git update-index -q --unmerged
    --ignore-missing --refresh
    
    /Volumes/jiho/discus $ git ls-files --others
    --exclude-standard -z
    discus.tmprojggplot_dens_and_points.Rij.shinvert_Y.Rjava_options.
    txtplot_gps.Rplots.pdfrange_circular_fix.Rscratchpad.Rscratchpad.sh
    /Volumes/jiho/discus $ git diff-files -z :100644 100644
    3c92e1bf126ac860c901056b95a12ca5ec3c9fab
    0000000000000000000000000000000000000000 M.gitignore:100644
    100644 e589c53c8bc1236f2c26fb919b7cbde58eeba5a4
    0000000000000000000000000000000000000000 MREADME.md:100755
    100755 b2627bde1a657c64002f12f46bd875ba1510d31f
    0000000000000000000000000000000000000000
    Mapply-to-all.sh:100755 100755
    872559f9a0ab6c0d6652e28f76bc327d8710d378
    0000000000000000000000000000000000000000 Mbb:100644 100644
    7387d20924d2d956de25c6e9bf64f30e02aa9d35
    0000000000000000000000000000000000000000 Mbb.conf:100755
    100755 549031662747a3e72b3bab1f632c254249cb9ed1
    0000000000000000000000000000000000000000 Mdata_stats.sh:100644
    100644 f9ce73e94f14285292a84b4fabeb0419afbbc522
    0000000000000000000000000000000000000000
    Mglobal_stats.R:100644 100644
    ec878543abb1f97a9236707b36b367e318e3393b
    0000000000000000000000000000000000000000 Mreorg_data.R:100644
    100644 94a9ed024d3859793618152ea559a168bbcbb5e2
    0000000000000000000000000000000000000000
    Msrc/GNU_GPL.txt:100644 100644
    4340bf03097dbb7c3da5519ba809915515c4b155
    0000000000000000000000000000000000000000
    Msrc/correct_tracks.R:100644 100644
    d62437858ec20a4e2ea205cba03d0d0d4a12d97c
    0000000000000000000000000000000000000000
    Msrc/ij.macro.open_process_stack.txt:100644 100644
    ea87b2ed9f28789ad11dfb8d3a101f7824e4498e
    0000000000000000000000000000000000000000
    Msrc/imagej/plugins/Manual_Tracking.java:100644 100644
    9f9f3c08fc1a2c86b4e52ed0d3b9f3650e27e0e9
    0000000000000000000000000000000000000000
    Msrc/lib_circular_stats.R:100644 100644
    5b54e19e1d271cbe18886fe1979e2f87a4eed926
    0000000000000000000000000000000000000000
    Msrc/lib_discus.sh:100644 100644
    2c0b85db44a1f90e1c00c828cce94f3de67348a7
    0000000000000000000000000000000000000000
    Msrc/lib_image_time.R:100644 100644
    d2fe114ea8044716b73d103d9fffda18a7417c4e
    0000000000000000000000000000000000000000
    Msrc/lib_shell.sh:100644 100644
    c2ed8503d24cd97ce026c865a81094da4fca9ba9
    0000000000000000000000000000000000000000 Msrc/stats.R:100644
    100644 776694862aec61259f9445d8e4f2bcfe176728a8
    0000000000000000000000000000000000000000
    Msrc/test_circular.R:100755 100755
    28c9181bbdfd6aa0651242d66db386eef4b7cf40
    0000000000000000000000000000000000000000 Msync_data.sh
    /Volumes/jiho/discus $
    
  • Pieter de Bie

    Pieter de Bie May 29th, 2009 @ 05:13 PM

    what does git gui do in this case?

  • JiHO

    JiHO May 29th, 2009 @ 05:32 PM

    It bugs too, badly. On the samba mount, there is a panel popping up stating:

    No differences detected
    
    .gitignore has no changed
    
    The modification date of this file was updated by
    another application, but the content within the file
    was not changed.
    
    A rescan will be automatically started to find other
    files which may have the same state.
    
    [OK]
    

    Upon pressing OK, the panel reappears and keeps reappearing.
    .gitignore is the first file in the list so that's why it is mentioned here.

    This made me wonder wether this was a clock problem on the computer. Setting the time on the server to -1h does not help.

    BTW, gitx and git-gui work perfectly through sshfs on the same two machines (but, even though convenient, sshfs is not as fast as samba on a local network).

    Thanks in advance.

  • Pieter de Bie

    Pieter de Bie May 29th, 2009 @ 05:35 PM

    OK, seems like a git/samba bug then. I suggest you try it on the git
    mailinglist instead.

  • Pieter de Bie

    Pieter de Bie May 29th, 2009 @ 11:30 PM

    • State changed from “new” to “hold”

Please Sign in or create a free account to add a new ticket.

With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.

New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

GitX is the nice-looking gitk clone for OS X

People watching this ticket

Referenced by

Pages