git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: David Aguilar <davvid@gmail.com>
Cc: Git ML <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
	Christophe Macabiau <christophemacabiau@gmail.com>
Subject: Re: [PATCH 3/3] difftool: handle modified symlinks in dir-diff mode
Date: Wed, 15 Mar 2017 17:41:06 +0100 (CET)	[thread overview]
Message-ID: <alpine.DEB.2.20.1703151739070.3767@virtualbox> (raw)
In-Reply-To: <20170315065406.6739-3-davvid@gmail.com>

Hi David,

On Tue, 14 Mar 2017, David Aguilar wrote:

> Detect the null object ID for symlinks in dir-diff so that difftool can
> detect when symlinks are modified in the worktree.
> 
> Previously, a null symlink object ID would crash difftool.
> Handle null object IDs as unknown content that must be read from
> the worktree.
> 
> Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
> This was reworked a bit since the original patch.
> The subject line changed, a lot of comments were added,
> and the tests were made more extensive.
> 
> This implementation is simpler since we now use a get_symlink()
> function in one place and simply skip the problematic code path
> that does not apply to symlinks.  Existing code handles writing
> the symlink content so write_symlink_file() from the original
> patch is gone.

I really like this version. It is very easy to follow, the extensive
comments make a lot of sense.

Well done!
Dscho


      reply	other threads:[~2017-03-15 16:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-15  6:54 [PATCH 1/3] t7800: remove whitespace before redirect David Aguilar
2017-03-15  6:54 ` [PATCH 2/3] t7800: cleanup cruft left behind by tests David Aguilar
2017-03-15  6:54 ` [PATCH 3/3] difftool: handle modified symlinks in dir-diff mode David Aguilar
2017-03-15 16:41   ` Johannes Schindelin [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.DEB.2.20.1703151739070.3767@virtualbox \
    --to=johannes.schindelin@gmx.de \
    --cc=christophemacabiau@gmail.com \
    --cc=davvid@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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).