summaryrefslogtreecommitdiff
path: root/vcs-svn/fast_export.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2012-02-07 05:05:48 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-07 08:59:40 -0800
commit701825de23da2bff6c784d33ff27f75e802abd81 (patch)
tree86234064ddf17ab0c2910bf20cc6968b54cd3737 /vcs-svn/fast_export.c
parentGit 1.7.6.6 (diff)
downloadtgif-701825de23da2bff6c784d33ff27f75e802abd81.tar.xz
add -e: do not show difference in a submodule that is merely dirty
When the HEAD of the submodule matches what is recorded in the index of the superproject, and it has local changes or untracked files, the patch offered by "git add -e" for editing shows a diff like this: diff --git a/submodule b/submodule <header> -deadbeef... +deadbeef...-dirty Because applying such a patch has no effect to the index, this is a useless noise. Generate the patch with IGNORE_DIRTY_SUBMODULES flag to prevent such a change from getting reported. This patch also loses the "-dirty" suffix from the output when the HEAD of the submodule is different from what is in the index of the superproject. As such dirtiness expressed by the suffix does not affect the result of the patch application at all, there is no information lost if we remove it. The user could still run "git status" before "git add -e" if s/he cares about the dirtiness. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'vcs-svn/fast_export.c')
0 files changed, 0 insertions, 0 deletions