From: Mark Levedahl <mlevedahl@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: regression in git-gui since 2c5c66b... Merge branch 'jp/get-ref-dir-unsorted
Date: Sun, 16 Oct 2011 14:10:58 -0400 [thread overview]
Message-ID: <4E9B1E32.7030101@gmail.com> (raw)
I have a project organized as a number of nested git modules (not using
git-submodule), and frequently use git-new-workdir to create the nested
modules.
Since the above merge-commit, git-gui is confused by this arrangement
and reports every file in every nested module as being an untracked file
in the top-level (super) project. Prior to the above merge, git-gui
properly stops recursing when finding a .git directory. git-gui also
continues working correctly when the modules are full clones, it just
doesn't work correctly when the .git directory contains symlinks to the
real .git directory contents.
git-gui works correctly on either parent of the above merge, just not
after the merge. As the merge was not clean, I guess Junio gets to
decide who owns the problem :^).
Note that core git is fine up to current master, it is only git-gui that
has become confused (e.g., git-status shows the top-level directory of
each nested module as untracked, but does not list files in the nested
modules).
Mark
next reply other threads:[~2011-10-16 18:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-16 18:10 Mark Levedahl [this message]
2011-10-17 0:35 ` regression in git-gui since 2c5c66b... Merge branch 'jp/get-ref-dir-unsorted Junio C Hamano
2011-10-17 1:38 ` Mark Levedahl
2011-10-17 3:40 ` Michael Haggerty
2011-10-17 10:07 ` Mark Levedahl
2011-10-17 13:35 ` Michael Haggerty
2011-10-17 13:55 ` Jeff King
2011-10-17 17:22 ` Junio C Hamano
2011-10-17 18:43 ` [PATCH] resolve_gitlink_packed_ref(): fix mismerge Junio C Hamano
2011-10-17 22:12 ` Mark Levedahl
2011-10-17 23:14 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E9B1E32.7030101@gmail.com \
--to=mlevedahl@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.