diff options
| author |  Hariom Verma <hariom18599@gmail.com> | 2020-02-23 18:57:08 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-24 11:13:44 -0800 |
| commit | 45f274fbb118cc4cb00640c30b4e3069d96755a0 (patch) | |
| tree | c7ee0fa5735c2f20e57791117e278f98c342346f /combine-diff.c | |
| parent | Git 2.25 (diff) | |
| download | tgif-45f274fbb118cc4cb00640c30b4e3069d96755a0.tar.xz | |
get_main_worktree(): allow it to be called in the Git directory
When called in the Git directory of a non-bare repository, this function
would not return the directory of the main worktree, but of the Git
directory instead.
The reason: when the Git directory is the current working directory, the
absolute path of the common directory will be reported with a trailing
`/.git/.`, which the code of `get_main_worktree()` does not handle
correctly.
Let's fix this.
Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Hariom Verma <hariom18599@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions