Databases
StackOverflow2013
Postsdbo
POGit status reports incorrect information
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit status reports incorrect information
    primarykey
    data
    text
    <p>I had a weird issue where an entire directory in my live CRM project was corrupted after resolving some conflicts from a merge (pull) and some reverts in this live working tree clone. </p> <p><em>Config Overview</em>:</p> <p>Bare repo on testing server at <code>/git/project.git</code> this is origin master</p> <p>Publicly accessible testing branch at <code>/var/www/html/project/httpdocs</code> which is automatically updated when you <code>push origin</code> from local using <code>/git/project.git/hooks</code> shell scripts.</p> <p>Publicly accessible live version at <code>/var/www/html/project/httpdocs</code> on another server which I pull manually to; I never push anything from here. </p> <p><em>Issue</em>:</p> <p>I had to manually copy over a local copy of the directory to get the live application working again. I ended up doing a <code>git reset --hard &lt;sha1&gt;</code> on the testing working tree back to the commit I wanted to be at (because the several commits after that were just totally janked), and a <code>git update-ref refs/heads/master &lt;sha1&gt;</code> to revert my <code>origin</code>, a bare public repository, back to the same commit. </p> <p>I'm just going to delete and re-clone the live branch because I don't care about commit history there and it seems to be a bit jacked up. </p> <p>Even though I have reset both the bare repo origin master AND the testing working tree back to the same commit -- when I run git status on the testing working tree it says my branch is behind origin/master by 4 commits. </p> <p>If I try to pull origin master or push origin master it says <code>everything is up to date</code>.</p> <p>What the deal?</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USZsolt Botykai
    1. USfunkenstein
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. POGit status reports incorrect information
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POGit status reports incorrect information
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POGit status reports incorrect information
      1. This table or related slice is empty.
      1. VTDownMod
    1. COUse `git log master..origin/master` or `gitk master origin/master` to see the commits that it thinks you're behind by.
      singulars
      1. POGit status reports incorrect information
      1. USCascabel
    2. COLook inside .git/refs/remotes. I think your repository have broken 'remotes' branches.
      singulars
      1. POGit status reports incorrect information
      1. USAlexandr Priymak
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload