Show involved files when displaying a merge
authorSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Mon, 1 Dec 2008 19:28:00 +0000 (20:28 +0100)
committerSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Mon, 1 Dec 2008 19:28:00 +0000 (20:28 +0100)
post-receive-email

index 8567740..4688bcf 100755 (executable)
@@ -319,7 +319,7 @@ set_update_branch_subject()
 {
        set_describe $newrev
 
-       describe="$(git diff-tree -r --name-only $oldrev${oldrev:+..}$newrev |
+       describe="$(git diff-tree -r -c --name-only $oldrev${oldrev:+..}$newrev |
                        skip_diff_tree_parent | sed -e '2,$s/^/ /') $describe"
        [ -n "$(git diff-tree -r --name-only --cc $oldrev${oldrev:+..}$newrev |
                skip_diff_tree_parent)" ]