summaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-02-14 18:59:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-22 18:08:05 (GMT)
commitbc099914d4a83e53a31eb6952d4366d9d8ac2c79 (patch)
tree22218c11ff2e363e36cdfdd179ed4ac528591141 /submodule.h
parent75b7b971ae07882c5ec6f76e21a0dbd76d70c187 (diff)
downloadgit-bc099914d4a83e53a31eb6952d4366d9d8ac2c79.zip
git-bc099914d4a83e53a31eb6952d4366d9d8ac2c79.tar.gz
git-bc099914d4a83e53a31eb6952d4366d9d8ac2c79.tar.bz2
submodule: rename 'new' variables
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h
index b9b7ef0..9589f13 100644
--- a/submodule.h
+++ b/submodule.h
@@ -117,7 +117,7 @@ int submodule_to_gitdir(struct strbuf *buf, const char *submodule);
#define SUBMODULE_MOVE_HEAD_FORCE (1<<1)
extern int submodule_move_head(const char *path,
const char *old,
- const char *new,
+ const char *new_head,
unsigned flags);
/*