From 7854dad6e08c58334bbff1a5c0e0da2f847c9ef1 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Sat, 7 Nov 2009 02:23:32 +0100 Subject: [PATCH] Revert "git-notify: Ignore `empty' commits" This reverts commit db63fbfa036f5cd757aedf4547fef9e195a8c285, as it is no longer needed and we'd like to keep the diff against the git-notify version maintained by the Wine people as small as possible. The purpose of db63fbfa was to suppress notifications on empty merge commits, which can now be requested directly by specifying git-notify's "-X" option. (Our change was implemented before the "-X" option was available, even though the Git history suggests otherwise.) Conflicts: tools/git-notify --- tools/git-notify | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/git-notify b/tools/git-notify index f524fd7..d53461c 100755 --- a/tools/git-notify +++ b/tools/git-notify @@ -404,12 +404,6 @@ sub send_commit_notice($$) my @notice = (); my ($url,$subject); - open DIFF, "-|" or exec "git", "diff-tree", "-p", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree"; - my $diff = join("", ); - close DIFF or die $! ? "Cannot execute diff-tree: $!" : "diff-tree exited with status: $?"; - - return if length($diff) == 0; - if ($gitweb_url) { open REVPARSE, "-|" or exec "git", "rev-parse", "--short", $obj or die "cannot exec git-rev-parse"; @@ -455,6 +449,10 @@ sub send_commit_notice($$) push @notice, join("", ); close STAT or die $! ? "Cannot execute diff-tree: $!" : "diff-tree exited with status: $?"; + open DIFF, "-|" or exec "git", "diff-tree", "-p", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree"; + my $diff = join("", ); + close DIFF or die $! ? "Cannot execute diff-tree: $!" : "diff-tree exited with status: $?"; + if (($max_diff_size == -1) || (length($diff) < $max_diff_size)) { push @notice, $diff; -- 2.30.2