Skip to main content

Browse the archive

Revision 18e2b1cfc80990719275d7b08e6e50f3e8cbc902 authored by Junio C Hamano on 02 March 2023, 23:13:30 UTC, committed by Johannes Schindelin on 17 April 2023, 19:15:41 UTC 
Merge branch 'js/apply-overwrite-rej-symlink-if-exists' into maint-2.30
 
Address CVE-2023-25652 by deleting any existing `.rej` symbolic links
instead of following them.

* js/apply-overwrite-rej-symlink-if-exists:
  apply --reject: overwrite existing `.rej` symlink if it exists

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
2 parent s 2f3b28f + 9db0571
Raw File
rebase.h 
#ifndef REBASE_H
#define REBASE_H

enum rebase_type {
	REBASE_INVALID = -1,
	REBASE_FALSE = 0,
	REBASE_TRUE,
	REBASE_PRESERVE,
	REBASE_MERGES,
	REBASE_INTERACTIVE
};

enum rebase_type rebase_parse_value(const char *value);

#endif /* REBASE */
back to top